QuickReplies:

x64 compilation fix

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

4 files changed, 23 insertions, 82 deletions

diff --git a/QuickReplies/common.h b/QuickReplies/common.h
index d21be34..026f4c5 100644
--- a/QuickReplies/common.h
+++ b/QuickReplies/common.h
@@ -21,8 +21,7 @@ Boston, MA 02111-1307, USA.
 #ifndef __QUICK_REPLY_H__

 #define __QUICK_REPLY_H__

 

-#define MIRANDA_VER 0x0900

-#define MIRANDA_CUSTOM_LP

+#define MIRANDA_VER 0x0A00

 

 #include <windows.h>

 #include <vector>

@@ -68,9 +67,9 @@ extern HANDLE hOnPreShutdown;
 

 INT_PTR QuickRepliesService(WPARAM wParam, LPARAM lParam);

 

-INT_PTR OnModulesLoaded(WPARAM wParam, LPARAM lParam);

-INT_PTR OnOptInitialized(WPARAM wParam, LPARAM lParam);

-INT_PTR OnButtonPressed(WPARAM wParam, LPARAM lParam);

-INT_PTR OnPreShutdown(WPARAM wParam, LPARAM lParam);

+INT OnModulesLoaded(WPARAM wParam, LPARAM lParam);

+INT OnOptInitialized(WPARAM wParam, LPARAM lParam);

+INT OnButtonPressed(WPARAM wParam, LPARAM lParam);

+INT OnPreShutdown(WPARAM wParam, LPARAM lParam);

 

 #endif //__QUICK_REPLY_H__
\ No newline at end of file
diff --git a/QuickReplies/events.cpp b/QuickReplies/events.cpp
index 1dfa8c8..25c9fb6 100644
--- a/QuickReplies/events.cpp
+++ b/QuickReplies/events.cpp
@@ -32,7 +32,7 @@ INT_PTR QuickRepliesService(WPARAM, LPARAM)
 	return TRUE;

 }

 

-INT_PTR OnModulesLoaded(WPARAM wParam, LPARAM lParam)

+INT OnModulesLoaded(WPARAM wParam, LPARAM lParam)

 {

 	UnhookEvent(hOnModulesLoaded);

 	HICON hIcon = NULL;

@@ -90,7 +90,7 @@ INT_PTR OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-INT_PTR OnButtonPressed(WPARAM wParam, LPARAM lParam)

+INT OnButtonPressed(WPARAM wParam, LPARAM lParam)

 {

 	char key[64];

 	int index = 0;

@@ -175,7 +175,7 @@ INT_PTR OnButtonPressed(WPARAM wParam, LPARAM lParam)
 	return 1;

 }

 

-INT_PTR OnPreShutdown(WPARAM wParam, LPARAM lParam)

+INT OnPreShutdown(WPARAM wParam, LPARAM lParam)

 {

 	if (ServiceExists(MS_BB_REMOVEBUTTON))

 	{

diff --git a/QuickReplies/options.cpp b/QuickReplies/options.cpp
index 3677688..2ae4d27 100644
--- a/QuickReplies/options.cpp
+++ b/QuickReplies/options.cpp
@@ -186,7 +186,7 @@ BOOL CALLBACK  DlgProcOptionsPage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 

 static UINT expertOnlyControls[] = { IDC_VARIABLES, IDC_VARIABLES_HINT };

 

-INT_PTR OnOptInitialized(WPARAM wParam, LPARAM lParam)

+INT OnOptInitialized(WPARAM wParam, LPARAM lParam)

 {

 	TCHAR tabName[32];

 	mir_sntprintf(tabName, SIZEOF(tabName), _T("Button %x"), iNumber + 1);

@@ -205,7 +205,7 @@ INT_PTR OnOptInitialized(WPARAM wParam, LPARAM lParam)
 	odp.nExpertOnlyControls			= SIZEOF(expertOnlyControls);

 

 	odp.pszTemplate					= MAKEINTRESOURCEA(IDD_OPTIONS_PAGE);

-	odp.pfnDlgProc					= DlgProcOptionsPage;

+	odp.pfnDlgProc					= (DLGPROC)DlgProcOptionsPage;

 

 	CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp);

 

diff --git a/QuickReplies/quickreplies_10.vcxproj b/QuickReplies/quickreplies_10.vcxproj
index 6223584..d6f0813 100644
--- a/QuickReplies/quickreplies_10.vcxproj
+++ b/QuickReplies/quickreplies_10.vcxproj
@@ -26,23 +26,19 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

     <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

     <CharacterSet>Unicode</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

     <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

     <CharacterSet>Unicode</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

@@ -66,16 +62,12 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

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

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

-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</IgnoreImportLibrary>

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

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

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

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>

-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</IgnoreImportLibrary>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>

-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</IgnoreImportLibrary>

     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" />

     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" />

@@ -103,41 +95,28 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

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

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

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

-      <PrecompiledHeaderFile>

-      </PrecompiledHeaderFile>

-      <PrecompiledHeaderOutputFile>

-      </PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>

-      </AssemblerListingLocation>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAs>CompileAsCpp</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

     </ClCompile>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

-      <AdditionalManifestDependencies>%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

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

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <TargetMachine>MachineX86</TargetMachine>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

     </Link>

   </ItemDefinitionGroup>

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

@@ -159,31 +138,22 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <PrecompiledHeaderFile>

-      </PrecompiledHeaderFile>

-      <PrecompiledHeaderOutputFile>

-      </PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>

-      </AssemblerListingLocation>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <CompileAs>Default</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <MapFileName>

       </MapFileName>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <TargetMachine>MachineX86</TargetMachine>

+      <SubSystem>Windows</SubSystem>

     </Link>

   </ItemDefinitionGroup>

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

@@ -200,42 +170,28 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

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

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

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

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <RuntimeTypeInfo>false</RuntimeTypeInfo>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <AssemblerListingLocation>

-      </AssemblerListingLocation>

       <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAs>Default</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

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

-      <Culture>0x0809</Culture>

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

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

-      <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <TargetMachine>MachineX64</TargetMachine>

+      <SubSystem>Windows</SubSystem>

     </Link>

   </ItemDefinitionGroup>

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

@@ -251,41 +207,27 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <StringPooling>false</StringPooling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>

-      </AssemblerListingLocation>

       <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAs>Default</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

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

-      <Culture>0x0809</Culture>

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

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>false</GenerateMapFile>

       <MapFileName>

       </MapFileName>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <TargetMachine>MachineX64</TargetMachine>

+      <SubSystem>Windows</SubSystem>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>