added precompiled header

added version info

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

10 files changed, 158 insertions, 124 deletions

diff --git a/plugins/QuickMessages/quickmessages_10.vcxproj b/plugins/QuickMessages/quickmessages_10.vcxproj
index de622d84dd..708ad88726 100644
--- a/plugins/QuickMessages/quickmessages_10.vcxproj
+++ b/plugins/QuickMessages/quickmessages_10.vcxproj
@@ -80,6 +80,8 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>quickmessages.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -108,6 +110,8 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>quickmessages.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -134,6 +138,8 @@
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>quickmessages.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -156,6 +162,8 @@
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>quickmessages.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -173,15 +181,20 @@
   <ItemGroup>

     <ClCompile Include="src\main.cpp" />

     <ClCompile Include="src\options.cpp" />

+    <ClCompile Include="src\stdafx.cpp">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

     <ClCompile Include="src\Utils.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\quickmessages.h" />

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\Utils.h" />

+    <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\quickmessages.rc" />

+    <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/QuickMessages/quickmessages_10.vcxproj.filters b/plugins/QuickMessages/quickmessages_10.vcxproj.filters
index fbdae253cb..592c9a832e 100644
--- a/plugins/QuickMessages/quickmessages_10.vcxproj.filters
+++ b/plugins/QuickMessages/quickmessages_10.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClCompile Include="src\Utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\quickmessages.h">

@@ -35,10 +38,16 @@
     <ClInclude Include="src\Utils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\Version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\quickmessages.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/QuickMessages/quickmessages_11.vcxproj b/plugins/QuickMessages/quickmessages_11.vcxproj
index 85379b3a1e..ba7bdc32e5 100644
--- a/plugins/QuickMessages/quickmessages_11.vcxproj
+++ b/plugins/QuickMessages/quickmessages_11.vcxproj
@@ -84,6 +84,8 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>quickmessages.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -112,6 +114,8 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>quickmessages.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -138,6 +142,8 @@
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>quickmessages.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -160,6 +166,8 @@
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeaderFile>quickmessages.h</PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -177,15 +185,20 @@
   <ItemGroup>

     <ClCompile Include="src\main.cpp" />

     <ClCompile Include="src\options.cpp" />

+    <ClCompile Include="src\stdafx.cpp">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

     <ClCompile Include="src\Utils.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\quickmessages.h" />

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\Utils.h" />

+    <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\quickmessages.rc" />

+    <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/QuickMessages/quickmessages_11.vcxproj.filters b/plugins/QuickMessages/quickmessages_11.vcxproj.filters
index fbdae253cb..592c9a832e 100644
--- a/plugins/QuickMessages/quickmessages_11.vcxproj.filters
+++ b/plugins/QuickMessages/quickmessages_11.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClCompile Include="src\Utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\quickmessages.h">

@@ -35,10 +38,16 @@
     <ClInclude Include="src\Utils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\Version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\quickmessages.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/QuickMessages/res/Version.rc b/plugins/QuickMessages/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/QuickMessages/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/QuickMessages/res/quickmessages.rc b/plugins/QuickMessages/res/quickmessages.rc
index 6cc083dc37..00fd075bf1 100644
--- a/plugins/QuickMessages/res/quickmessages.rc
+++ b/plugins/QuickMessages/res/quickmessages.rc
@@ -7,7 +7,7 @@
 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

-#include <windows.h>

+#include <winres.h>

 

 /////////////////////////////////////////////////////////////////////////////

 #undef APSTUDIO_READONLY_SYMBOLS

@@ -34,7 +34,7 @@ END
 

 2 TEXTINCLUDE 

 BEGIN

-    "#include <windows.h>\r\n"

+    "#include <winres.h>\r\n"

     "\0"

 END

 

@@ -81,52 +81,6 @@ BEGIN
     CONTROL         "Consider as ServiceName",IDC_ISSERVNAME2,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,117,196,189,20

 END

 

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO 

-BEGIN

-    IDD_OPTIONS, DIALOG

-    BEGIN

-        RIGHTMARGIN, 314

-        VERTGUIDE, 5

-        VERTGUIDE, 105

-        VERTGUIDE, 110

-        VERTGUIDE, 114

-        VERTGUIDE, 307

-        BOTTOMMARGIN, 251

-        HORZGUIDE, 9

-        HORZGUIDE, 19

-        HORZGUIDE, 149

-        HORZGUIDE, 152

-        HORZGUIDE, 166

-        HORZGUIDE, 169

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-#endif    // Neutral resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-/////////////////////////////////////////////////////////////////////////////

-// Russian resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)

-#ifdef _WIN32

-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

-#pragma code_page(1251)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

 IDD_HELPDIALOG DIALOGEX 0, 0, 202, 210

 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU

 EXSTYLE WS_EX_TOOLWINDOW

@@ -160,6 +114,23 @@ END
 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO 

 BEGIN

+    IDD_OPTIONS, DIALOG

+    BEGIN

+        RIGHTMARGIN, 314

+        VERTGUIDE, 5

+        VERTGUIDE, 105

+        VERTGUIDE, 110

+        VERTGUIDE, 114

+        VERTGUIDE, 307

+        BOTTOMMARGIN, 251

+        HORZGUIDE, 9

+        HORZGUIDE, 19

+        HORZGUIDE, 149

+        HORZGUIDE, 152

+        HORZGUIDE, 166

+        HORZGUIDE, 169

+    END

+

     IDD_HELPDIALOG, DIALOG

     BEGIN

         LEFTMARGIN, 7

@@ -180,43 +151,7 @@ END
 // remains consistent on all systems.

 IDI_QICON               ICON                    "qicon.ico"

 

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 0,0,4,2

- PRODUCTVERSION 0,0,4,2

- FILEFLAGSMASK 0x17L

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x4L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "041904b0"

-        BEGIN

-            VALUE "Author", "MaD_CLuSTeR"

-            VALUE "FileDescription", "Quick Messages"

-            VALUE "FileVersion", "0.0.4.2"

-            VALUE "InternalName", "quick messages"

-            VALUE "LegalCopyright", "Copyright © 2008 Danil Mozhar"

-            VALUE "ProductVersion", "0, 0, 4, 2"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x419, 1200

-    END

-END

-

-#endif    // Russian resources

+#endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////

 

 

diff --git a/plugins/QuickMessages/src/Version.h b/plugins/QuickMessages/src/Version.h
new file mode 100644
index 0000000000..e42cd7c92b
--- /dev/null
+++ b/plugins/QuickMessages/src/Version.h
@@ -0,0 +1,14 @@
+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				4

+#define __BUILD_NUM					2

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Quick messages"

+#define __FILENAME					"QuickMessages.dll"

+#define __DESCRIPTION 				"Plugin for quick insert pre-defined messages in message input area."

+#define __AUTHOR					"MaD_CLuSTeR"

+#define __AUTHOREMAIL				"daniok@yandex.ru"

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

+#define __COPYRIGHT					"© 2008 Danil Mozhar"

diff --git a/plugins/QuickMessages/src/main.cpp b/plugins/QuickMessages/src/main.cpp
index 7fba5f8e4e..45777de3f7 100644
--- a/plugins/QuickMessages/src/main.cpp
+++ b/plugins/QuickMessages/src/main.cpp
@@ -33,16 +33,16 @@ BOOL g_bQuickMenu=0;
 

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

-	MODULENAME,

-	PLUGIN_MAKE_VERSION(0,0,4,2),

-	"Plugin for quick insert pre-defined messages in message input area.",

-	"MaD_CLuSTeR",

-	"daniok@yandex.ru",

-	"© 2008 Danil Mozhar",

-	"http://miranda-ng.org/",

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	// {37ED754B-6CF9-40ed-9EB6-0FEF8E822475}

-	{ 0x37ed754b, 0x6cf9, 0x40ed, { 0x9e, 0xb6, 0xf, 0xef, 0x8e, 0x82, 0x24, 0x75 } }

+	// {37ED754B-6CF9-40ED-9EB6-0FEF8E822475}

+	{0x37ed754b, 0x6cf9, 0x40ed, {0x9e, 0xb6, 0xf, 0xef, 0x8e, 0x82, 0x24, 0x75}}

 };

 

 int PreShutdown(WPARAM wparam,LPARAM lparam)

diff --git a/plugins/QuickMessages/src/quickmessages.h b/plugins/QuickMessages/src/quickmessages.h
index af7c4a5879..d68f03ee8b 100644
--- a/plugins/QuickMessages/src/quickmessages.h
+++ b/plugins/QuickMessages/src/quickmessages.h
@@ -16,36 +16,30 @@ 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 <http://www.gnu.org/licenses/>.

 */

-#define _CRT_SECURE_NO_DEPRECATE

 

+#define _CRT_SECURE_NO_DEPRECATE

 

-#include <tchar.h>

 #include <windows.h>

-#include "resource.h"

-#include <stdio.h>

 #include <commctrl.h>

 #include <Richedit.h>

 

-#define MIRANDA_VER  0x0A00

-#include "newpluginapi.h"

-#include "m_utils.h"

-#include "m_system.h"

-#include "m_clist.h"

-#include "m_options.h"

-#include "m_database.h"

-#include "m_protomod.h"

-#include "m_langpack.h"

-#include "m_icolib.h"

-#include "m_message.h"

-#include "m_contacts.h"

-#include "win2k.h"

+#include <newpluginapi.h>

+#include <m_clist.h>

+#include <m_options.h>

+#include <m_database.h>

+#include <m_protomod.h>

+#include <m_langpack.h>

+#include <m_icolib.h>

+#include <m_message.h>

+#include <m_contacts.h>

+#include <win2k.h>

 

-#include "Utils.h"

-#include "m_msg_buttonsbar.h"

+#include <m_msg_buttonsbar.h>

 

-#pragma optimize("gsy",on)

+#include "resource.h"

+#include "Version.h"

+#include "Utils.h"

 

-#define MODULENAME "Quick Messages"

 #define PLGNAME "QuickMessages"

 

 extern HINSTANCE hinstance;

@@ -61,12 +55,3 @@ int OptionsInit(WPARAM,LPARAM);
 

 #define IDC_MESSAGE      1002

 #define IDC_CHATMESSAGE  1009

-

-#define QMESSAGES_NAME "quickmessages"

-

-#define QMESSAGES_VERSION_URL "http://miranda.radicaled.ru/public/updater/quickmessages.txt"

-#define QMESSAGES_CHAGELOG_URL "http://miranda.radicaled.ru/public/quickmessages/changelog_en.txt"

-#define QMESSAGES_UPDATE_URL "http://miranda.radicaled.ru/public/quickmessages/"QMESSAGES_NAME".zip"

-#define QMESSAGES_UPDATE_URL "http://miranda.radicaled.ru/public/quickmessages/"QMESSAGES_NAME".zip"

-

-#define QMESSAGES_VERSION_PREFIX "QuickMessages "

diff --git a/plugins/QuickMessages/src/stdafx.cpp b/plugins/QuickMessages/src/stdafx.cpp
new file mode 100644
index 0000000000..bf6c2c9701
--- /dev/null
+++ b/plugins/QuickMessages/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 <http://www.gnu.org/licenses/>.

+*/

+

+#include "quickmessages.h"
\ No newline at end of file