version info standartization

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

14 files changed, 110 insertions, 107 deletions

diff --git a/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj b/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj
index 09e67d851a..a514c5a240 100644
--- a/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj
+++ b/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj
@@ -78,8 +78,10 @@
       <MinimalRebuild>true</MinimalRebuild>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

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

@@ -101,8 +103,10 @@
       <Optimization>Disabled</Optimization>

       <WarningLevel>Level3</WarningLevel>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

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

@@ -125,8 +129,10 @@
       <Optimization>Full</Optimization>

       <WarningLevel>Level3</WarningLevel>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

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

@@ -152,8 +158,10 @@
       <Optimization>Full</Optimization>

       <WarningLevel>Level3</WarningLevel>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

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

@@ -173,7 +181,12 @@
   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

+    </ClCompile>

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

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

   </ItemGroup>

@@ -183,17 +196,11 @@
     <ClInclude Include="src\options.h" />

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

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

-  </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="res\Alt.bmp" />

-    <CustomBuild Include="res\CopyToClipboard.ico" />

-    <CustomBuild Include="res\Ctrl.bmp" />

-    <CustomBuild Include="res\Popup.ico" />

-    <CustomBuild Include="res\Shift.bmp" />

-    <CustomBuild Include="res\Win.bmp" />

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj.filters b/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj.filters
index 08d69521d7..4b7f4bd650 100644
--- a/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj.filters
+++ b/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj.filters
@@ -44,30 +44,16 @@
     <ClInclude Include="src\text_operations.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="res\Alt.bmp">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="res\CopyToClipboard.ico">

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

       <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="res\Ctrl.bmp">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="res\Popup.ico">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="res\Shift.bmp">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="res\Win.bmp">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

+    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
index 6f6823ab14..c4e830b1cf 100644
--- a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
+++ b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
@@ -67,51 +67,6 @@ IDB_BITMAP_ALT          BITMAP       "Alt.bmp"
 IDB_BITMAP_CTRL         BITMAP       "Ctrl.bmp"

 IDB_BITMAP_SHIFT        BITMAP       "Shift.bmp"

 

-#ifndef _MAC

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

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 0,0,1,5

- PRODUCTVERSION 0,0,1,5

- FILEFLAGSMASK 0x3fL

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x40004L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "000004b0"

-        BEGIN

-            VALUE "Comments", "\0"

-            VALUE "CompanyName", "\0"

-            VALUE "FileDescription", "Plugin for change keyboard layout of text (multilayout)\0"

-            VALUE "FileVersion", "0, 0, 1, 5\0"

-            VALUE "InternalName", "ChangeKeyboardLayout\0"

-            VALUE "LegalCopyright", "Copyright © 2006-2009 Mikhail Yur'ev\0"

-            VALUE "LegalTrademarks", "\0"

-            VALUE "OriginalFilename", "ChangeKeyboardLayout.dll\0"

-            VALUE "PrivateBuild", "\0"

-            VALUE "ProductName", "ChangeKeyboardLayout\0"

-            VALUE "ProductVersion", "0, 0, 1, 5\0"

-            VALUE "SpecialBuild", "\0"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x0, 1200

-    END

-END

-

-#endif    // !_MAC

-

 #endif    // Russian resources

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

 

@@ -194,20 +149,20 @@ BEGIN
                     WS_TABSTOP

     EDITTEXT        IDC_EDIT_SET,42,208,261,14,ES_AUTOHSCROLL

     PUSHBUTTON      "Default",IDC_BUTTON_DEFAULT,253,226,50,14

-    CONTROL         112,IDC_STATIC,"Static",SS_BITMAP,80,23,15,8

-    CONTROL         111,IDC_STATIC,"Static",SS_BITMAP,110,23,12,8

-    CONTROL         113,IDC_STATIC,"Static",SS_BITMAP,50,23,17,8

-    CONTROL         110,IDC_STATIC,"Static",SS_BITMAP,136,23,13,8

+    CONTROL         IDB_BITMAP_CTRL,IDC_STATIC,"Static",SS_BITMAP,80,23,15,8

+    CONTROL         IDB_BITMAP_ALT,IDC_STATIC,"Static",SS_BITMAP,110,23,12,8

+    CONTROL         IDB_BITMAP_SHIFT,IDC_STATIC,"Static",SS_BITMAP,50,23,17,8

+    CONTROL         IDB_BITMAP_WIN,IDC_STATIC,"Static",SS_BITMAP,136,23,13,8

     LTEXT           "+",IDC_STATIC,153,22,8,8

-    CONTROL         112,IDC_STATIC,"Static",SS_BITMAP,80,50,15,8

-    CONTROL         111,IDC_STATIC,"Static",SS_BITMAP,110,50,12,8

-    CONTROL         113,IDC_STATIC,"Static",SS_BITMAP,50,50,17,8

-    CONTROL         110,IDC_STATIC,"Static",SS_BITMAP,136,50,13,8

+    CONTROL         IDB_BITMAP_CTRL,IDC_STATIC,"Static",SS_BITMAP,80,50,15,8

+    CONTROL         IDB_BITMAP_ALT,IDC_STATIC,"Static",SS_BITMAP,110,50,12,8

+    CONTROL         IDB_BITMAP_SHIFT,IDC_STATIC,"Static",SS_BITMAP,50,50,17,8

+    CONTROL         IDB_BITMAP_WIN,IDC_STATIC,"Static",SS_BITMAP,136,50,13,8

     LTEXT           "+",IDC_STATIC,153,49,8,8

-    CONTROL         112,IDC_STATIC,"Static",SS_BITMAP,80,77,15,8

-    CONTROL         111,IDC_STATIC,"Static",SS_BITMAP,110,77,12,8

-    CONTROL         113,IDC_STATIC,"Static",SS_BITMAP,50,77,17,8

-    CONTROL         110,IDC_STATIC,"Static",SS_BITMAP,136,77,13,8

+    CONTROL         IDB_BITMAP_CTRL,IDC_STATIC,"Static",SS_BITMAP,80,77,15,8

+    CONTROL         IDB_BITMAP_ALT,IDC_STATIC,"Static",SS_BITMAP,110,77,12,8

+    CONTROL         IDB_BITMAP_SHIFT,IDC_STATIC,"Static",SS_BITMAP,50,77,17,8

+    CONTROL         IDB_BITMAP_WIN,IDC_STATIC,"Static",SS_BITMAP,136,77,13,8

     LTEXT           "+",IDC_STATIC,153,76,8,8

     CONTROL         "Invert current state",IDC_RADIO_INVERTCAPS,"Button",

                     BS_AUTORADIOBUTTON,171,145,133,10

diff --git a/plugins/ChangeKeyboardLayout/res/Version.rc b/plugins/ChangeKeyboardLayout/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/ChangeKeyboardLayout/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/ChangeKeyboardLayout/res/alt.ico b/plugins/ChangeKeyboardLayout/res/alt.ico
deleted file mode 100644
index d9a0c3f721..0000000000
--- a/plugins/ChangeKeyboardLayout/res/alt.ico
+++ /dev/null
diff --git a/plugins/ChangeKeyboardLayout/res/ctrl.ico b/plugins/ChangeKeyboardLayout/res/ctrl.ico
deleted file mode 100644
index 0f894cf2cb..0000000000
--- a/plugins/ChangeKeyboardLayout/res/ctrl.ico
+++ /dev/null
diff --git a/plugins/ChangeKeyboardLayout/res/shift.ico b/plugins/ChangeKeyboardLayout/res/shift.ico
deleted file mode 100644
index 15d7d89f34..0000000000
--- a/plugins/ChangeKeyboardLayout/res/shift.ico
+++ /dev/null
diff --git a/plugins/ChangeKeyboardLayout/res/win.ico b/plugins/ChangeKeyboardLayout/res/win.ico
deleted file mode 100644
index a6b4623522..0000000000
--- a/plugins/ChangeKeyboardLayout/res/win.ico
+++ /dev/null
diff --git a/plugins/ChangeKeyboardLayout/src/Version.h b/plugins/ChangeKeyboardLayout/src/Version.h
new file mode 100644
index 0000000000..a80b84c7fd
--- /dev/null
+++ b/plugins/ChangeKeyboardLayout/src/Version.h
@@ -0,0 +1,20 @@
+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				1

+#define __BUILD_NUM					5

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

+

+#define __STRINGIFY_IMPL(x)			#x

+#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)

+#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)

+

+#define __PLUGIN_NAME				"Change Keyboard Layout"

+#define __INTERNAL_NAME				"ChangeKeyboardLayout"

+#define __FILENAME					"ChangeKeyboardLayout.dll"

+#define __DESCRIPTION 				"Plugin for change keyboard layout of text (multilayout)."

+#define __AUTHOR					"Yasnovidyashii"

+#define __AUTHOREMAIL				"Yasnovidyashii@gmail.com"

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

+#define __COPYRIGHT					"© 2006-2009 Mikhail Yur'ev"

diff --git a/plugins/ChangeKeyboardLayout/src/commonheaders.h b/plugins/ChangeKeyboardLayout/src/commonheaders.h
index b772f9555e..27646be794 100644
--- a/plugins/ChangeKeyboardLayout/src/commonheaders.h
+++ b/plugins/ChangeKeyboardLayout/src/commonheaders.h
@@ -27,13 +27,11 @@
 #include "options.h"

 #include "hook_events.h"

 #include "text_operations.h"

+#include "version.h"

 

-

-#define VERSION PLUGIN_MAKE_VERSION(0,0,1,5)

 #define MaxTextSize 64000

 #define ModuleName "ChangeKeyboardLayout"

 

-

 // History++ API

 #define MS_HPP_EG_WINDOW			"History++/ExtGrid/NewWindow"

 #define MS_HPP_EG_EVENT				"History++/ExtGrid/Event"

diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
index 5c94609252..6acadc9aea 100644
--- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp
+++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
@@ -1,4 +1,4 @@
-#include "hook_events.h"

+#include "commonheaders.h"

 

 INT_PTR APIChangeLayout(WPARAM wParam, LPARAM lParam)

 {

@@ -177,7 +177,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	OnIconsChanged(0, 0);

 	RegPopupActions();

 	

-	DBWriteContactSettingDword(NULL, ModuleName, "CurrentVer", VERSION);

+	DBWriteContactSettingDword(NULL, ModuleName, "CurrentVer", PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM));

 	return 0;

 }

 

diff --git a/plugins/ChangeKeyboardLayout/src/main.cpp b/plugins/ChangeKeyboardLayout/src/main.cpp
index d54934fe0a..e175cb5278 100644
--- a/plugins/ChangeKeyboardLayout/src/main.cpp
+++ b/plugins/ChangeKeyboardLayout/src/main.cpp
@@ -14,16 +14,16 @@ HANDLE hIcoLibIconsChanged;
 

 PLUGININFOEX pluginInfoEx = {

 	sizeof(PLUGININFOEX),

-	"Change Keyboard Layout",

-	VERSION,

-	"Plugin for change keyboard layout of text (multilayout).",

-	"Yasnovidyashii",

-	"Yasnovidyashii@gmail.com",

-	"© 2006-2009 Mikhail Yur'ev",

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

-	UNICODE_AWARE,		//doesn't replace anything built-in

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

+	UNICODE_AWARE,

 	// {c5ef53a8-80d4-4ce9-b341-ec90d3ec9156}

-	{0xc5ef53a8, 0x80d4, 0x4ce9, { 0xb3, 0x41, 0xec, 0x90, 0xd3, 0xec, 0x91, 0x56 }}

+	{0xc5ef53a8, 0x80d4, 0x4ce9, {0xb3, 0x41, 0xec, 0x90, 0xd3, 0xec, 0x91, 0x56}}

 };

 

 LPCTSTR ptszKeybEng = _T("`1234567890- = \\qwertyuiop[]asdfghjkl;'zxcvbnm,./~!@#$%^&*()_+|QWERTYUIOP{}ASDFGHJKL:\"ZXCVBNM<>?");

@@ -34,7 +34,7 @@ LPCTSTR ptszSeparators = _T(" \t\n\r");
 HANDLE hOptionsInitialize;

 HANDLE hModulesLoaded;

 

-BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

 {

 	hInst = hinstDLL;

 	return TRUE;

diff --git a/plugins/ChangeKeyboardLayout/src/options.cpp b/plugins/ChangeKeyboardLayout/src/options.cpp
index 39c678a9f3..63a811b212 100644
--- a/plugins/ChangeKeyboardLayout/src/options.cpp
+++ b/plugins/ChangeKeyboardLayout/src/options.cpp
@@ -1,5 +1,4 @@
-#include "options.h"

-

+#include "commonheaders.h"

 

 INT_PTR CALLBACK DlgMainProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, LPARAM lParam)

 {

diff --git a/plugins/ChangeKeyboardLayout/src/text_operations.cpp b/plugins/ChangeKeyboardLayout/src/text_operations.cpp
index f4441ef4ae..779885a383 100644
--- a/plugins/ChangeKeyboardLayout/src/text_operations.cpp
+++ b/plugins/ChangeKeyboardLayout/src/text_operations.cpp
@@ -1,4 +1,4 @@
-#include "text_operations.h"

+#include "commonheaders.h"

 

 struct EditStreamData {

 	PBYTE pbBuff;