another part of small project fixes

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@205 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

7 files changed, 54 insertions, 45 deletions

diff --git a/ContactsPlus/contacts.sln b/ContactsPlus/contacts.sln
index cc02a85..c21b623 100644
--- a/ContactsPlus/contacts.sln
+++ b/ContactsPlus/contacts.sln
@@ -1,7 +1,6 @@
-

 Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "contacts", "contacts.vcxproj", "{6313461F-4A15-F5D1-DFA5-5BFEC3A6D97E}"

+# Visual C++ Express 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "contacts", "contacts.vcxproj", "{103919CE-FE60-F6CA-ECFF-76E5A5FB3736}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -11,14 +10,14 @@ Global
 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{6313461F-4A15-F5D1-DFA5-5BFEC3A6D97E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{6313461F-4A15-F5D1-DFA5-5BFEC3A6D97E}.Debug|Win32.Build.0 = Debug|Win32

-		{6313461F-4A15-F5D1-DFA5-5BFEC3A6D97E}.Debug|x64.ActiveCfg = Debug|x64

-		{6313461F-4A15-F5D1-DFA5-5BFEC3A6D97E}.Debug|x64.Build.0 = Debug|x64

-		{6313461F-4A15-F5D1-DFA5-5BFEC3A6D97E}.Release|Win32.ActiveCfg = Release|Win32

-		{6313461F-4A15-F5D1-DFA5-5BFEC3A6D97E}.Release|Win32.Build.0 = Release|Win32

-		{6313461F-4A15-F5D1-DFA5-5BFEC3A6D97E}.Release|x64.ActiveCfg = Release|x64

-		{6313461F-4A15-F5D1-DFA5-5BFEC3A6D97E}.Release|x64.Build.0 = Release|x64

+		{103919CE-FE60-F6CA-ECFF-76E5A5FB3736}.Debug|Win32.ActiveCfg = Debug|Win32

+		{103919CE-FE60-F6CA-ECFF-76E5A5FB3736}.Debug|Win32.Build.0 = Debug|Win32

+		{103919CE-FE60-F6CA-ECFF-76E5A5FB3736}.Debug|x64.ActiveCfg = Debug|x64

+		{103919CE-FE60-F6CA-ECFF-76E5A5FB3736}.Debug|x64.Build.0 = Debug|x64

+		{103919CE-FE60-F6CA-ECFF-76E5A5FB3736}.Release|Win32.ActiveCfg = Release|Win32

+		{103919CE-FE60-F6CA-ECFF-76E5A5FB3736}.Release|Win32.Build.0 = Release|Win32

+		{103919CE-FE60-F6CA-ECFF-76E5A5FB3736}.Release|x64.ActiveCfg = Release|x64

+		{103919CE-FE60-F6CA-ECFF-76E5A5FB3736}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/ContactsPlus/contacts.vcxproj b/ContactsPlus/contacts.vcxproj
index 2eea585..87480d3 100644
--- a/ContactsPlus/contacts.vcxproj
+++ b/ContactsPlus/contacts.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>

+<?xml version="1.0" encoding="utf-8"?>

 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup Label="ProjectConfigurations">

     <ProjectConfiguration Include="Debug|Win32">

@@ -65,37 +65,38 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <LinkIncremental>false</LinkIncremental>

+    <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>

+    <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <LinkIncremental>false</LinkIncremental>

+    <OutDir>$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

+    <IntDir>$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>.\Debug\</OutDir>

-    <IntDir>.\Debug\</IntDir>

+    <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>

+    <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>.\Debug\</OutDir>

-    <IntDir>.\Debug\</IntDir>

+    <OutDir>$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

+    <IntDir>$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <Optimization>MaxSpeed</Optimization>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <WarningLevel>Level3</WarningLevel>

-      <AdditionalIncludeDirectories>E:\!Miranda\miranda\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

-      <AssemblerListingLocation>.\Release\</AssemblerListingLocation>

-      <PrecompiledHeaderOutputFile>.\Release\contacts.pch</PrecompiledHeaderOutputFile>

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

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

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>contacts.h</PrecompiledHeaderFile>

-      <ObjectFileName>.\Release\</ObjectFileName>

-      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Midl>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -110,15 +111,12 @@
     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Release\contacts.bsc</OutputFile>

     </Bscmake>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>false</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

-      <OutputFile>.\Release\contacts.dll</OutputFile>

-      <ImportLibrary>.\Release\contacts.lib</ImportLibrary>

       <AdditionalOptions> /ALIGN:4096  /ignore:4108</AdditionalOptions>

       <AdditionalDependencies>comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

@@ -132,7 +130,7 @@
       <Optimization>MaxSpeed</Optimization>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <WarningLevel>Level3</WarningLevel>

-      <AdditionalIncludeDirectories>E:\!Miranda\miranda\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <AssemblerListingLocation>.\Release\</AssemblerListingLocation>

       <PrecompiledHeaderOutputFile>.\Release\contacts.pch</PrecompiledHeaderOutputFile>

@@ -175,12 +173,8 @@
       <WarningLevel>Level3</WarningLevel>

       <MinimalRebuild>true</MinimalRebuild>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <AdditionalIncludeDirectories>E:\!Miranda\miranda\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

-      <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>

-      <PrecompiledHeaderOutputFile>.\Debug\contacts.pch</PrecompiledHeaderOutputFile>

-      <ObjectFileName>.\Debug\</ObjectFileName>

-      <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

     </ClCompile>

     <Midl>

@@ -196,15 +190,12 @@
     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Debug\contacts.bsc</OutputFile>

     </Bscmake>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

-      <OutputFile>.\Debug\contacts.dll</OutputFile>

-      <ImportLibrary>.\Debug\contacts.lib</ImportLibrary>

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

@@ -217,7 +208,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <AdditionalIncludeDirectories>E:\!Miranda\miranda\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>

       <PrecompiledHeaderOutputFile>.\Debug\contacts.pch</PrecompiledHeaderOutputFile>

@@ -280,4 +271,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/ContactsPlus/contacts.vcxproj.filters b/ContactsPlus/contacts.vcxproj.filters
index 8814508..85cd463 100644
--- a/ContactsPlus/contacts.vcxproj.filters
+++ b/ContactsPlus/contacts.vcxproj.filters
@@ -54,8 +54,8 @@
     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <None Include="SendContacts.ico">

+    <CustomBuild Include="res\SendContacts.ico">

       <Filter>Resource Files</Filter>

-    </None>

+    </CustomBuild>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/FavContacts/favcontacts.sln b/FavContacts/favcontacts.sln
new file mode 100644
index 0000000..4572aa3
--- /dev/null
+++ b/FavContacts/favcontacts.sln
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual C++ Express 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "favcontacts", "favcontacts.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug Unicode|Win32 = Debug Unicode|Win32

+		Release Unicode|Win32 = Release Unicode|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/FavContacts/favcontacts.vcproj b/FavContacts/favcontacts.vcproj
index 581619c..c2518ac 100644
--- a/FavContacts/favcontacts.vcproj
+++ b/FavContacts/favcontacts.vcproj
@@ -41,7 +41,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FAVCONTACTS_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -120,7 +120,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="1"

 				FavorSizeOrSpeed="2"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FAVCONTACTS_EXPORTS"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"

diff --git a/FavContacts/favcontacts.vcxproj b/FavContacts/favcontacts.vcxproj
index 6c364d3..d0ca295 100644
--- a/FavContacts/favcontacts.vcxproj
+++ b/FavContacts/favcontacts.vcxproj
@@ -52,7 +52,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;../ExternalAPI</AdditionalIncludeDirectories>

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -76,7 +76,7 @@
     <ClCompile>

       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>../../include;../ExternalAPI</AdditionalIncludeDirectories>

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

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

       <ExceptionHandling>

       </ExceptionHandling>

diff --git a/FavContacts/src/main.cpp b/FavContacts/src/main.cpp
index b6d7486..5e5a1f1 100644
--- a/FavContacts/src/main.cpp
+++ b/FavContacts/src/main.cpp
@@ -543,7 +543,7 @@ static BOOL sttMeasureItem_Contact(LPMEASUREITEMSTRUCT lpmis, Options *options)
 			{

 				char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

 				int status = DBGetContactSettingWord(hContact, proto, "Status", ID_STATUS_OFFLINE);

-				title = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, status, GCMDF_TCHAR);

+				title = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, status, GSMDF_TCHAR);

 			} else

 			{

 				title = dbv.ptszVal;

@@ -830,7 +830,7 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = NULL)
 		if (DBGetContactSettingTString(hContact, "CList", "StatusMsg", &dbv) || !*dbv.ptszVal)

 		{

 			int status = DBGetContactSettingWord(hContact, proto, "Status", ID_STATUS_OFFLINE);

-			title = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, status, GCMDF_TCHAR);

+			title = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, status, GSMDF_TCHAR);

 		} else

 		{

 			title = dbv.ptszVal;