x64 compilation fix

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

8 files changed, 31 insertions, 41 deletions

diff --git a/plugins/WinterSpeak/WinterSpeak_10.vcxproj b/plugins/WinterSpeak/WinterSpeak_10.vcxproj
index cd1b88c170..36086c43b1 100644
--- a/plugins/WinterSpeak/WinterSpeak_10.vcxproj
+++ b/plugins/WinterSpeak/WinterSpeak_10.vcxproj
@@ -20,7 +20,7 @@
   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectName>WinterSpeak</ProjectName>

-    <ProjectGuid>{C810C799-197C-4F6C-A047-3F1814CC364B}</ProjectGuid>

+    <ProjectGuid>{A44F96D0-A850-4A67-9570-0E9298A16E40}</ProjectGuid>

   </PropertyGroup>

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

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

@@ -80,7 +80,6 @@
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <ExceptionHandling>Sync</ExceptionHandling>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -93,9 +92,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

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

     </Link>

   </ItemDefinitionGroup>

@@ -108,7 +106,6 @@
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -121,8 +118,9 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -135,7 +133,6 @@
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -147,13 +144,13 @@
       <LinkDLL>true</LinkDLL>

       <SubSystem>Windows</SubSystem>

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -166,7 +163,6 @@
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -178,12 +174,13 @@
       <LinkDLL>true</LinkDLL>

       <SubSystem>Windows</SubSystem>

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/WinterSpeak/WinterSpeak_11.vcxproj b/plugins/WinterSpeak/WinterSpeak_11.vcxproj
index d23b125183..0c404a89b2 100644
--- a/plugins/WinterSpeak/WinterSpeak_11.vcxproj
+++ b/plugins/WinterSpeak/WinterSpeak_11.vcxproj
@@ -20,7 +20,7 @@
   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectName>WinterSpeak</ProjectName>

-    <ProjectGuid>{C810C799-197C-4F6C-A047-3F1814CC364B}</ProjectGuid>

+    <ProjectGuid>{A44F96D0-A850-4A67-9570-0E9298A16E40}</ProjectGuid>

   </PropertyGroup>

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

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

@@ -84,7 +84,6 @@
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <ExceptionHandling>Sync</ExceptionHandling>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -112,7 +111,6 @@
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -127,6 +125,7 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -139,7 +138,6 @@
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <ExceptionHandling>Sync</ExceptionHandling>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -156,8 +154,7 @@
       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -170,7 +167,6 @@
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <ExceptionHandling>false</ExceptionHandling>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -187,7 +183,7 @@
       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/WinterSpeak/src/DialogConfigActive.cpp b/plugins/WinterSpeak/src/DialogConfigActive.cpp
index 8caea38e8b..5d20b91586 100644
--- a/plugins/WinterSpeak/src/DialogConfigActive.cpp
+++ b/plugins/WinterSpeak/src/DialogConfigActive.cpp
@@ -19,7 +19,7 @@ DialogConfigActive::~DialogConfigActive()
 }

 

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

-int CALLBACK DialogConfigActive::process(HWND window, UINT message, WPARAM wparam, LPARAM lparam)

+INT_PTR CALLBACK DialogConfigActive::process(HWND window, UINT message, WPARAM wparam, LPARAM lparam)

 {

 	if (!m_instance)

 	{

diff --git a/plugins/WinterSpeak/src/EventInformation.cpp b/plugins/WinterSpeak/src/EventInformation.cpp
index 69437a71ea..65923022d2 100644
--- a/plugins/WinterSpeak/src/EventInformation.cpp
+++ b/plugins/WinterSpeak/src/EventInformation.cpp
@@ -71,7 +71,7 @@ std::wstring EventInformation::getMessage()
 }

 

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

-unsigned int EventInformation::getMessageSize()

+size_t EventInformation::getMessageSize()

 {

 	return std::wstring((WCHAR *)m_event_info.pBlob).size();

 }

diff --git a/plugins/WinterSpeak/src/EventInformation.h b/plugins/WinterSpeak/src/EventInformation.h
index 2715dee7f9..42169d21e9 100644
--- a/plugins/WinterSpeak/src/EventInformation.h
+++ b/plugins/WinterSpeak/src/EventInformation.h
@@ -39,7 +39,7 @@ class EventInformation
 	// Description : get the size of the message from the last event

 	// Return      : the size of the message

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

-	unsigned int getMessageSize();

+	size_t getMessageSize();

 

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

 	// Description : get the event string

diff --git a/plugins/WinterSpeak/src/ProtocolInformation.cpp b/plugins/WinterSpeak/src/ProtocolInformation.cpp
index d04f485a9b..d601fa6757 100644
--- a/plugins/WinterSpeak/src/ProtocolInformation.cpp
+++ b/plugins/WinterSpeak/src/ProtocolInformation.cpp
@@ -27,6 +27,15 @@ ProtocolInformation::~ProtocolInformation()
 	}

 }

 

+void CALLBACK ProtocolInformation::TimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)

+{

+	ProtocolTimeout pt = m_instance->m_protocol_timeout.front();    

+	

+	KillTimer(NULL, pt.second);

+

+	m_instance->m_protocol_timeout.pop_front();

+}

+

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

 void ProtocolInformation::disable(const char *protocol)

 {

@@ -37,7 +46,7 @@ void ProtocolInformation::disable(const char *protocol)
 

 	const unsigned int TIMEOUT = 10000;

 

-	unsigned int t  = SetTimer(NULL, NULL, TIMEOUT, ProtocolInformation::timeout);

+	unsigned int t  = SetTimer(NULL, (UINT_PTR)this, TIMEOUT, (TIMERPROC)TimerProc);

 	m_protocol_timeout.push_back(std::make_pair(protocol, t));

 }

 

@@ -63,16 +72,4 @@ bool ProtocolInformation::isDisabled(const char *protocol) const
 	return false;

 }

 

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

-// private:

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

-void CALLBACK ProtocolInformation::timeout(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)

-{

-	ProtocolTimeout pt = m_instance->m_protocol_timeout.front();    

-	

-	KillTimer(NULL, pt.second);

-

-	m_instance->m_protocol_timeout.pop_front();

-}

-

 //==============================================================================

diff --git a/plugins/WinterSpeak/src/ProtocolInformation.h b/plugins/WinterSpeak/src/ProtocolInformation.h
index dcfb6eca18..b57fc14f0a 100644
--- a/plugins/WinterSpeak/src/ProtocolInformation.h
+++ b/plugins/WinterSpeak/src/ProtocolInformation.h
@@ -16,8 +16,7 @@ class ProtocolInformation
 	typedef std::pair<std::string, unsigned int> ProtocolTimeout;

 	typedef std::deque<ProtocolTimeout>          ProtocolTimeoutQueue;

 

-	static void CALLBACK timeout(HWND hwnd, UINT uMsg, UINT idEvent, 

-		DWORD dwTime);

+	static void CALLBACK TimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime);

 

 	static ProtocolInformation *m_instance;

 

diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp
index debe87cf29..301d165901 100644
--- a/plugins/WinterSpeak/src/main.cpp
+++ b/plugins/WinterSpeak/src/main.cpp
@@ -29,11 +29,12 @@ PLUGININFOEX pluginInfo={
 //-----------------------------------------------------------------------------

 // Description : External hook

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

-int status(WPARAM wParam, LPARAM lParam)

+INT_PTR status(WPARAM wParam, LPARAM lParam)

 {

 	return g_speak_config->status(reinterpret_cast<WCHAR *>(lParam), reinterpret_cast<HANDLE>(wParam));

 }

-int message(WPARAM wParam, LPARAM lParam)

+

+INT_PTR message(WPARAM wParam, LPARAM lParam)

 {

 	return g_speak_config->message(reinterpret_cast<WCHAR *>(lParam), reinterpret_cast<HANDLE>(wParam));

 }