added precompiled header

added version info

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

16 files changed, 175 insertions, 126 deletions

diff --git a/plugins/FavContacts/favcontacts_10.vcxproj b/plugins/FavContacts/favcontacts_10.vcxproj
index b610d125a1..dbc98ea08a 100644
--- a/plugins/FavContacts/favcontacts_10.vcxproj
+++ b/plugins/FavContacts/favcontacts_10.vcxproj
@@ -73,16 +73,18 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -98,14 +100,16 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -122,13 +126,15 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <WarningLevel>Level3</WarningLevel>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -148,13 +154,15 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <WarningLevel>Level3</WarningLevel>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -171,22 +179,27 @@
   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-    <ClInclude Include="src\favlist.h" />

-    <ClInclude Include="src\headers.h" />

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/FavContacts/favcontacts_10.vcxproj.filters b/plugins/FavContacts/favcontacts_10.vcxproj.filters
index c6c913ffe9..305b7789aa 100644
--- a/plugins/FavContacts/favcontacts_10.vcxproj.filters
+++ b/plugins/FavContacts/favcontacts_10.vcxproj.filters
@@ -13,28 +13,25 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

     </Filter>

-    <Filter Include="http">

-      <UniqueIdentifier>{190cde56-eadb-44f2-a0cd-1cb46fe8de29}</UniqueIdentifier>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\contact_cache.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\favlist.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

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

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

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\cserver.cpp">

-      <Filter>http</Filter>

+      <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\csocket.cpp">

-      <Filter>http</Filter>

+      <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\http_api.cpp">

-      <Filter>http</Filter>

+      <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

@@ -47,19 +44,28 @@
     <ClInclude Include="src\headers.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

-      <Filter>http</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>http</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>http</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.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/FavContacts/favcontacts_11.vcxproj b/plugins/FavContacts/favcontacts_11.vcxproj
index f5005bec59..63338a132a 100644
--- a/plugins/FavContacts/favcontacts_11.vcxproj
+++ b/plugins/FavContacts/favcontacts_11.vcxproj
@@ -77,16 +77,18 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -102,14 +104,16 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -126,13 +130,15 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <WarningLevel>Level3</WarningLevel>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -152,13 +158,15 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <WarningLevel>Level3</WarningLevel>

       <ExceptionHandling>false</ExceptionHandling>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -175,22 +183,27 @@
   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-    <ClInclude Include="src\favlist.h" />

-    <ClInclude Include="src\headers.h" />

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/FavContacts/favcontacts_11.vcxproj.filters b/plugins/FavContacts/favcontacts_11.vcxproj.filters
index c6c913ffe9..305b7789aa 100644
--- a/plugins/FavContacts/favcontacts_11.vcxproj.filters
+++ b/plugins/FavContacts/favcontacts_11.vcxproj.filters
@@ -13,28 +13,25 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

     </Filter>

-    <Filter Include="http">

-      <UniqueIdentifier>{190cde56-eadb-44f2-a0cd-1cb46fe8de29}</UniqueIdentifier>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\contact_cache.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\favlist.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

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

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

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\cserver.cpp">

-      <Filter>http</Filter>

+      <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\csocket.cpp">

-      <Filter>http</Filter>

+      <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\http_api.cpp">

-      <Filter>http</Filter>

+      <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

@@ -47,19 +44,28 @@
     <ClInclude Include="src\headers.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

-      <Filter>http</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>http</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>http</Filter>

+      <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.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/FavContacts/res/Version.rc b/plugins/FavContacts/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/FavContacts/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/FavContacts/res/resource.rc b/plugins/FavContacts/res/resource.rc
index bb5ecda54a..b7f9c3aa1d 100644
--- a/plugins/FavContacts/res/resource.rc
+++ b/plugins/FavContacts/res/resource.rc
@@ -67,12 +67,6 @@ BEGIN
     LTEXT           "recent contacts",IDC_STATIC,84,160,65,10,SS_CENTERIMAGE

 END

 

-IDD_LIST DIALOGEX 0, 0, 316, 183

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-END

-

 

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

 //

@@ -99,14 +93,6 @@ BEGIN
         HORZGUIDE, 240

         HORZGUIDE, 246

     END

-

-    IDD_LIST, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 309

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 176

-    END

 END

 #endif    // APSTUDIO_INVOKED

 

@@ -114,15 +100,6 @@ END
 /////////////////////////////////////////////////////////////////////////////

 

 

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

-// Ukrainian resources

-

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

-#ifdef _WIN32

-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

-#pragma code_page(1251)

-#endif //_WIN32

-

 #ifdef APSTUDIO_INVOKED

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

 //

@@ -148,10 +125,6 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-#endif    // Ukrainian resources

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

-

-

 

 #ifndef APSTUDIO_INVOKED

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

@@ -162,4 +135,3 @@ END
 

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

 #endif    // not APSTUDIO_INVOKED

-

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

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					6

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Favourite contacts"

+#define __FILENAME					"FavContacts.dll"

+#define __DESCRIPTION 				"Favourite contacts menu."

+#define __AUTHOR					"Victor Pavlychko"

+#define __AUTHOREMAIL				"nullbie@gmail.com"

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

+#define __COPYRIGHT					"© 2007-2009 Victor Pavlychko"

diff --git a/plugins/FavContacts/src/contact_cache.cpp b/plugins/FavContacts/src/contact_cache.cpp
index 19d3c42d82..3fa6b2b6ec 100644
--- a/plugins/FavContacts/src/contact_cache.cpp
+++ b/plugins/FavContacts/src/contact_cache.cpp
@@ -1,6 +1,4 @@
 #include "headers.h"

-#include <time.h>

-#include <math.h>

 

 int __cdecl CContactCache::OnDbEventAdded(WPARAM wParam, LPARAM lParam)

 {

diff --git a/plugins/FavContacts/src/cserver.cpp b/plugins/FavContacts/src/cserver.cpp
index 957d1a6048..b39c1df431 100644
--- a/plugins/FavContacts/src/cserver.cpp
+++ b/plugins/FavContacts/src/cserver.cpp
@@ -1,9 +1,4 @@
-#include <winsock2.h>

-#include <windows.h>

-#include <ws2tcpip.h>

-

-#include "csocket.h"

-#include "cserver.h"

+#include "headers.h"

 

 void CServer::Start(int port, IConnectionProcessorFactory *connectionProcessorFactory, bool background)

 {

diff --git a/plugins/FavContacts/src/csocket.cpp b/plugins/FavContacts/src/csocket.cpp
index dfff16fbf1..c8a2b40503 100644
--- a/plugins/FavContacts/src/csocket.cpp
+++ b/plugins/FavContacts/src/csocket.cpp
@@ -1,8 +1,4 @@
-#include <winsock2.h>

-#include <windows.h>

-#include <ws2tcpip.h>

-

-#include "csocket.h"

+#include "headers.h"

 

 int CSocket::Recv(char *buf, int count)

 {

diff --git a/plugins/FavContacts/src/favlist.cpp b/plugins/FavContacts/src/favlist.cpp
deleted file mode 100644
index e69de29bb2..0000000000
--- a/plugins/FavContacts/src/favlist.cpp
+++ /dev/null
diff --git a/plugins/FavContacts/src/headers.h b/plugins/FavContacts/src/headers.h
index 12d91e847d..e5e6f21412 100644
--- a/plugins/FavContacts/src/headers.h
+++ b/plugins/FavContacts/src/headers.h
@@ -19,44 +19,40 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #define _CRT_SECURE_NO_DEPRECATE

-

-#include <tchar.h>

 #define _WIN32_WINNT 0x0501

+

+#include <winsock2.h>

 #include <windows.h>

 #include <commctrl.h>

-#include <stdio.h>

 #include <malloc.h>

+#include <time.h>

+#include <math.h>

 

-#define MIRANDA_VER	0x0A00

 #include <win2k.h>

 #include <newpluginapi.h>

-#include <m_system.h>

 #include <m_system_cpp.h>

 #include <m_database.h>

 #include <m_langpack.h>

-#include <m_button.h>

 #include <m_clist.h>

 #include <m_clc.h>

-#include <m_clui.h>

-#include <m_options.h>

 #include <m_protosvc.h>

-#include <m_utils.h>

 #include <m_skin.h>

 #include <m_contacts.h>

 #include <m_userinfo.h>

-#include <m_history.h>

-#include <m_addcontact.h>

 #include <m_message.h>

-#include <m_file.h>

 #include <m_icolib.h>

-#include <m_idle.h>

-#include <m_awaymsg.h>

 #include <m_avatars.h>

-#include <m_toptoolbar.h>

 #include <m_fontservice.h>

 #include <m_hotkeys.h>

 

+#include <m_toptoolbar.h>

+

 #include "resource.h"

+#include "version.h"

+#include "contact_cache.h"

+#include "http_api.h"

+#include "csocket.h"

+#include "cserver.h"

 

 struct Options

 {

@@ -78,11 +74,6 @@ struct Options
 	HFONT hfntName, hfntSecond;

 };

 

-

-#include "contact_cache.h"

-

 extern Options g_Options;

 extern CContactCache *g_contactCache;

-

 #include "favlist.h"

-#include "http_api.h"

diff --git a/plugins/FavContacts/src/http_api.cpp b/plugins/FavContacts/src/http_api.cpp
index fccd06968b..c4929e6c3c 100644
--- a/plugins/FavContacts/src/http_api.cpp
+++ b/plugins/FavContacts/src/http_api.cpp
@@ -1,10 +1,5 @@
 #include "headers.h"

 

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

-

-#include "csocket.h"

-#include "cserver.h"

-

 #define MS_FAVCONTACTS_OPEN_CONTACT			"FavContacts/OpenContact"

 

 class CHttpProcessor: public IConnectionProcessor

diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp
index 0c1345d000..6271074da6 100644
--- a/plugins/FavContacts/src/main.cpp
+++ b/plugins/FavContacts/src/main.cpp
@@ -20,22 +20,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "headers.h"

 

-DWORD     g_mirandaVersion;

 HINSTANCE g_hInst;

 

 int hLangpack;

 

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

-	"Favourite Contacts",

-	PLUGIN_MAKE_VERSION(0, 0, 0, 6),

-	"Favourite contacts menu.",

-	"code by Victor Pavlychko, icons by Angeli-Ka",

-	"nullbie@gmail.com",

-	"Copyright 2007-2009 Victor Pavlychko",

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

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	// {CE2C0401-F9E0-40d7-8E95-1A4197D7AB04}

+	// {CE2C0401-F9E0-40D7-8E95-1A4197D7AB04}

 	{0xce2c0401, 0xf9e0, 0x40d7, {0x8e, 0x95, 0x1a, 0x41, 0x97, 0xd7, 0xab, 0x4}}

 };

 

diff --git a/plugins/FavContacts/src/resource.h b/plugins/FavContacts/src/resource.h
index 9466fd8859..ca419ff8ef 100644
--- a/plugins/FavContacts/src/resource.h
+++ b/plugins/FavContacts/src/resource.h
@@ -3,11 +3,7 @@
 // Used by resource.rc

 //

 #define IDI_FAVOURITE                   101

-#define IDI_ICON1                       102

 #define IDI_REGULAR                     102

-#define IDD_DIALOG1                     103

-#define IDD_LIST                        103

-#define IDD_PROPPAGE_LARGE              107

 #define IDD_OPTIONS                     107

 #define IDC_CLIST                       1001

 #define IDC_CHK_SECONDLINE              1003

@@ -22,7 +18,6 @@
 #define IDC_CHK_GROUPS                  1013

 #define IDC_CHK_GROUPCOLUMS             1014

 #define IDC_BTN_FONTS                   1015

-#define IDC_TXT_RADIUS2                 1016

 #define IDC_TXT_MAXRECENT               1016

 #define IDC_CHK_RIGHTAVATARS            1019

 

diff --git a/plugins/FavContacts/src/stdafx.cpp b/plugins/FavContacts/src/stdafx.cpp
new file mode 100644
index 0000000000..48d92d3d56
--- /dev/null
+++ b/plugins/FavContacts/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 "headers.h"
\ No newline at end of file