updated Contacts+ plug-in:

- applied x64 compatibility patch from FREAK_THEMIGHTY

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

11 files changed, 228 insertions, 107 deletions

diff --git a/ContactsPlus/contacts.dsp b/ContactsPlus/contacts.dsp
index 3f2e5d2..29adec3 100644
--- a/ContactsPlus/contacts.dsp
+++ b/ContactsPlus/contacts.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CONTACTS_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "E:\!Miranda\miranda\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CONTACTS_EXPORTS" /Yu"contacts.h" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\ExternalAPI" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CONTACTS_EXPORTS" /Yu"contacts.h" /FD /c

 # SUBTRACT CPP /Fr

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -68,9 +68,10 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CONTACTS_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CONTACTS_EXPORTS" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\ExternalAPI" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CONTACTS_EXPORTS" /YX /FD /GZ /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x405 /d "_DEBUG"

@@ -80,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

 

 !ENDIF 

 

@@ -163,7 +164,7 @@ SOURCE=.\contacts.rc
 # End Source File

 # Begin Source File

 

-SOURCE=.\SendContacts.ico

+SOURCE=.\res\SendContacts.ico

 # End Source File

 # End Group

 # End Target

diff --git a/ContactsPlus/contacts.rc b/ContactsPlus/contacts.rc
index b5b8d74..3edfca4 100644
--- a/ContactsPlus/contacts.rc
+++ b/ContactsPlus/contacts.rc
@@ -186,6 +186,6 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_CONTACTS            ICON    DISCARDABLE     "SendContacts.ico"

+IDI_CONTACTS            ICON    DISCARDABLE     "res\\SendContacts.ico"

 #endif    // Neutral resources

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

diff --git a/ContactsPlus/contacts.sln b/ContactsPlus/contacts.sln
index b2c8cfc..cc02a85 100644
--- a/ContactsPlus/contacts.sln
+++ b/ContactsPlus/contacts.sln
@@ -1,18 +1,24 @@
-

+

 Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual C++ Express 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "contacts", "contacts.vcxproj", "{546604FA-B25F-4D58-B05D-0F9018B54664}"

+# Visual Studio 2010

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

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

 		Release|Win32 = Release|Win32

+		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{546604FA-B25F-4D58-B05D-0F9018B54664}.Debug|Win32.ActiveCfg = Debug|Win32

-		{546604FA-B25F-4D58-B05D-0F9018B54664}.Debug|Win32.Build.0 = Debug|Win32

-		{546604FA-B25F-4D58-B05D-0F9018B54664}.Release|Win32.ActiveCfg = Release|Win32

-		{546604FA-B25F-4D58-B05D-0F9018B54664}.Release|Win32.Build.0 = Release|Win32

+		{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

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/ContactsPlus/contacts.vcxproj b/ContactsPlus/contacts.vcxproj
index cf5fdcd..2eea585 100644
--- a/ContactsPlus/contacts.vcxproj
+++ b/ContactsPlus/contacts.vcxproj
@@ -1,17 +1,26 @@
-<?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">

       <Configuration>Debug</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

     <ProjectConfiguration Include="Release|Win32">

       <Configuration>Release</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectGuid>{546604FA-B25F-4D58-B05D-0F9018B54664}</ProjectGuid>

+    <SccProjectName />

+    <SccLocalPath />

   </PropertyGroup>

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

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

@@ -19,139 +28,241 @@
     <UseOfMfc>false</UseOfMfc>

     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseOfMfc>false</UseOfMfc>

     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />

+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />

+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

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

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

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

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

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

+    <OutDir>.\Debug\</OutDir>

+    <IntDir>.\Debug\</IntDir>

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

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

+    <OutDir>.\Debug\</OutDir>

+    <IntDir>.\Debug\</IntDir>

+    <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

+    <ClCompile>

+      <RuntimeLibrary>MultiThreadedDLL</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>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>contacts.h</PrecompiledHeaderFile>

+      <ObjectFileName>.\Release\</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>

+    </ClCompile>

     <Midl>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

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

+      <TypeLibraryName>.\Release\contacts.tlb</TypeLibraryName>

       <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>.\Release/contacts.tlb</TypeLibraryName>

-      <HeaderFileName>

-      </HeaderFileName>

     </Midl>

+    <ResourceCompile>

+      <Culture>0x0405</Culture>

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

+    </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>

+  </ItemDefinitionGroup>

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

     <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <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>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>contacts.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <ObjectFileName>.\Release\</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>

     </ClCompile>

-    <ResourceCompile>

+    <Midl>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

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

+      <TypeLibraryName>.\Release\contacts.tlb</TypeLibraryName>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+    </Midl>

+    <ResourceCompile>

       <Culture>0x0405</Culture>

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

     </ResourceCompile>

-    <Link>

-      <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>

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

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <GenerateMapFile>true</GenerateMapFile>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

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

     </Bscmake>

+    <Link>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <LinkDLL>true</LinkDLL>

+      <GenerateDebugInformation>false</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

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

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

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

+    </Link>

   </ItemDefinitionGroup>

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

+    <ClCompile>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <Optimization>Disabled</Optimization>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <WarningLevel>Level3</WarningLevel>

+      <MinimalRebuild>true</MinimalRebuild>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <AdditionalIncludeDirectories>E:\!Miranda\miranda\include;%(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>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

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

+      <TypeLibraryName>.\Debug\contacts.tlb</TypeLibraryName>

       <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>.\Debug/contacts.tlb</TypeLibraryName>

-      <HeaderFileName>

-      </HeaderFileName>

     </Midl>

+    <ResourceCompile>

+      <Culture>0x0405</Culture>

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

+    </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>

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

     <ClCompile>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

       <Optimization>Disabled</Optimization>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

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

-      <MinimalRebuild>true</MinimalRebuild>

+      <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>

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

+      <ObjectFileName>.\Debug\</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

-    <ResourceCompile>

+    <Midl>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

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

+      <TypeLibraryName>.\Debug\contacts.tlb</TypeLibraryName>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+    </Midl>

+    <ResourceCompile>

       <Culture>0x0405</Culture>

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

     </ResourceCompile>

+    <Bscmake>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

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

+    </Bscmake>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

+      <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

+      <SubSystem>Console</SubSystem>

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

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

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

     </Link>

-    <Bscmake>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Bscmake>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="contacts.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

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

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">contacts.h</PrecompiledHeaderFile>

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">contacts.h</PrecompiledHeaderFile>

     </ClCompile>

     <ClCompile Include="main.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="receive.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="send.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="utils.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

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

     </ClCompile>

+    <ClCompile Include="receive.cpp" />

+    <ClCompile Include="send.cpp" />

+    <ClCompile Include="utils.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="contacts.h" />

@@ -161,15 +272,12 @@
     <ClInclude Include="utils.h" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="contacts.rc">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ResourceCompile>

+    <ResourceCompile Include="contacts.rc" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="SendContacts.ico" />

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/ContactsPlus/main.cpp b/ContactsPlus/main.cpp
index 3ea902b..7f167c8 100644
--- a/ContactsPlus/main.cpp
+++ b/ContactsPlus/main.cpp
@@ -52,7 +52,11 @@ int g_UnicodeCore;
 

 PLUGININFOEX pluginInfo = {

   sizeof(PLUGININFOEX),

+#ifdef WIN64

+  "Send/Receive Contacts+ (x64)",

+#else

   "Send/Receive Contacts+",

+#endif

   PLUGIN_MAKE_VERSION(1,5,2,0),

   "Allows you to send and receive contacts",

   "Joe Kucera, Todor Totev",

@@ -206,8 +210,10 @@ static int HookModulesLoaded(WPARAM wParam, LPARAM lParam)
   ghSendWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0); // no need to destroy this

   ghRecvWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0); // no need to destroy this

 

+#ifndef WIN64

   //register for Update (the FL name is different...)

   CallService(MS_UPDATE_REGISTERFL, 1253, (WPARAM)&pluginInfo);

+#endif

 

   ProcessUnreadEvents();

   return 0;

@@ -245,7 +251,7 @@ static int HookContactDeleted(WPARAM wParam, LPARAM lParam)
 }

 

 

-static int ServiceSendCommand(WPARAM wParam, LPARAM lParam)

+static INT_PTR ServiceSendCommand(WPARAM wParam, LPARAM lParam)

 {

   HWND hWnd;

   //find window for hContact

@@ -261,7 +267,7 @@ static int ServiceSendCommand(WPARAM wParam, LPARAM lParam)
   return 0;

 }

 

-static int ServiceReceiveCommand(WPARAM wParam, LPARAM lParam)

+static INT_PTR ServiceReceiveCommand(WPARAM wParam, LPARAM lParam)

 {

   CLISTEVENT* pcle = (CLISTEVENT*)lParam;

 

@@ -336,8 +342,8 @@ extern "C" __declspec(dllexport) int Load(PLUGINLINK *link)
   hServiceSend = CreateServiceFunction(MS_CONTACTS_SEND, ServiceSendCommand);

   hServiceReceive = CreateServiceFunction(MS_CONTACTS_RECEIVE, ServiceReceiveCommand);

   //define event sounds

-  SkinAddNewSound("RecvContacts", Translate("Incoming Contacts"), "contacts.wav");

-  SkinAddNewSound("SentContacts", Translate("Outgoing Contacts"), "ocontacts.wav");

+  SkinAddNewSound("RecvContacts", LPGEN("Incoming Contacts"), "contacts.wav");

+  SkinAddNewSound("SentContacts", LPGEN("Outgoing Contacts"), "ocontacts.wav");

 

   return 0;

 }

diff --git a/ContactsPlus/receive.cpp b/ContactsPlus/receive.cpp
index d639f04..16c63e6 100644
--- a/ContactsPlus/receive.cpp
+++ b/ContactsPlus/receive.cpp
@@ -170,9 +170,9 @@ void RecvListView_AddColumn(HWND hList, int nWidth, const char* szTitle, int nTr
 }

 

 

-int CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-  TRecvContactsData* wndData = (TRecvContactsData*)GetWindowLong(hwndDlg, DWL_USER);

+  TRecvContactsData* wndData = (TRecvContactsData*)GetWindowLong(hwndDlg, DWLP_USER);

 

   switch (msg)

   {

@@ -186,7 +186,7 @@ int CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
       EnableDlgItem(hwndDlg, IDOK, FALSE);

       EnableDlgItem(hwndDlg, IDDETAILS, FALSE);

       wndData = new TRecvContactsData(pcle->hContact);

-      SetWindowLong(hwndDlg, DWL_USER, (LONG)wndData);

+      SetWindowLong(hwndDlg, DWLP_USER, (LONG)wndData);

       wndData->mhDbEvent = pcle->hDbEvent; /// initialized, pcle not needed anymore

       wndData->mhListIcon = ImageList_Create(GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),ILC_COLORDDB|ILC_MASK, 0, 1);

       wndData->mhPopup = LoadMenu(hInst, MAKEINTRESOURCE(IDR_CONTACTMENU));

diff --git a/ContactsPlus/receive.h b/ContactsPlus/receive.h
index 3580033..fe35d94 100644
--- a/ContactsPlus/receive.h
+++ b/ContactsPlus/receive.h
@@ -60,6 +60,6 @@ struct TRecvContactsData {
 

 extern HANDLE ghRecvWindowList;

 

-int CALLBACK RecvDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

+INT_PTR CALLBACK RecvDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

 

 #endif /* __RECEIVE_H */
\ No newline at end of file
diff --git a/ContactsPlus/SendContacts.ico b/ContactsPlus/res/SendContacts.ico
index 6c118a1..6c118a1 100644
--- a/ContactsPlus/SendContacts.ico
+++ b/ContactsPlus/res/SendContacts.ico
diff --git a/ContactsPlus/send.cpp b/ContactsPlus/send.cpp
index be0c510..58007cb 100644
--- a/ContactsPlus/send.cpp
+++ b/ContactsPlus/send.cpp
@@ -251,9 +251,9 @@ static void SetAllContactChecks(HWND hwndList, HANDLE hReceiver) // doubtful nam
 }

 

 

-int CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-  TSendContactsData* wndData = (TSendContactsData*)GetWindowLong(hwndDlg, DWL_USER);

+  TSendContactsData* wndData = (TSendContactsData*)GetWindowLong(hwndDlg, DWLP_USER);

 

   switch (msg)

   {

@@ -265,7 +265,7 @@ int CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
       SetAllContactChecks(GetDlgItem(hwndDlg,IDC_LIST), (HANDLE)lParam);

       WindowList_Add(ghSendWindowList, hwndDlg, (HANDLE)lParam);

       wndData = new TSendContactsData((HANDLE)lParam);

-      SetWindowLong(hwndDlg, DWL_USER, (LONG)wndData);

+      SetWindowLong(hwndDlg, DWLP_USER, (LONG)wndData);

       // new dlg init 

       wndData->hIcons[0] = InitMButton(hwndDlg, IDC_ADD, MAKEINTRESOURCEA(IDI_ADDCONTACT), "Add Contact Permanently to List");

       wndData->hIcons[1] = InitMButton(hwndDlg, IDC_DETAILS, MAKEINTRESOURCEA(IDI_USERDETAILS), "View User's Details");

@@ -559,7 +559,7 @@ int CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 

 // Error Dialog

 

-BOOL CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

   switch(msg)

   {

diff --git a/ContactsPlus/send.h b/ContactsPlus/send.h
index 90cdd5f..c8580a4 100644
--- a/ContactsPlus/send.h
+++ b/ContactsPlus/send.h
@@ -103,8 +103,8 @@ struct gAckList {
 extern HANDLE ghSendWindowList;

 extern gAckList gaAckData;

 

-int CALLBACK SendDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

-BOOL CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+INT_PTR CALLBACK SendDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

+INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

 

 #endif /* __SEND_H */
\ No newline at end of file
diff --git a/ContactsPlus/utils.cpp b/ContactsPlus/utils.cpp
index e9332d8..864e3bb 100644
--- a/ContactsPlus/utils.cpp
+++ b/ContactsPlus/utils.cpp
@@ -152,7 +152,7 @@ char *GetContactUID(HANDLE hContact, int bTchar)
 

 TCHAR* MirandaStatusToStringT(int mirandaStatus)

 {

-  return (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, mirandaStatus, g_UnicodeCore ? GCMDF_UNICODE : 0);

+  return (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, mirandaStatus, g_UnicodeCore ? GSMDF_UNICODE : 0);

 }

 

 HANDLE __fastcall SRCFindFirstContact()