64-bit compilation fixes

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

4 files changed, 10 insertions, 16 deletions

diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib
index 120283ba4e..dd51c84a24 100644
--- a/bin10/lib/mir_core64.lib
+++ b/bin10/lib/mir_core64.lib
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index fb30934085..13b02144ee 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual C++ Express 2010

+# Visual Studio 2010

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs_10.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chat", "..\plugins\Chat\chat_10.vcxproj", "{268BD296-8DD3-4715-A386-CF120398EC98}"

@@ -1054,7 +1054,8 @@ Global
 		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|x64.Build.0 = Release|x64

 		{4C1CE389-7129-45FC-83C2-E9C310AC0427}.Debug|Win32.ActiveCfg = Debug|Win32

 		{4C1CE389-7129-45FC-83C2-E9C310AC0427}.Debug|Win32.Build.0 = Debug|Win32

-		{4C1CE389-7129-45FC-83C2-E9C310AC0427}.Debug|x64.ActiveCfg = Debug|Win32

+		{4C1CE389-7129-45FC-83C2-E9C310AC0427}.Debug|x64.ActiveCfg = Debug|x64

+		{4C1CE389-7129-45FC-83C2-E9C310AC0427}.Debug|x64.Build.0 = Debug|x64

 		{4C1CE389-7129-45FC-83C2-E9C310AC0427}.Release|Win32.ActiveCfg = Release|Win32

 		{4C1CE389-7129-45FC-83C2-E9C310AC0427}.Release|Win32.Build.0 = Release|Win32

 		{4C1CE389-7129-45FC-83C2-E9C310AC0427}.Release|x64.ActiveCfg = Release|Win32

@@ -1632,7 +1633,8 @@ Global
 		{1423FC8F-AA52-4562-8275-4BF0838CA378}.Release|x64.Build.0 = Release|x64

 		{53F841E8-284F-4545-9176-B131896E43F8}.Debug|Win32.ActiveCfg = Debug|Win32

 		{53F841E8-284F-4545-9176-B131896E43F8}.Debug|Win32.Build.0 = Debug|Win32

-		{53F841E8-284F-4545-9176-B131896E43F8}.Debug|x64.ActiveCfg = Debug|Win32

+		{53F841E8-284F-4545-9176-B131896E43F8}.Debug|x64.ActiveCfg = Debug|x64

+		{53F841E8-284F-4545-9176-B131896E43F8}.Debug|x64.Build.0 = Debug|x64

 		{53F841E8-284F-4545-9176-B131896E43F8}.Release|Win32.ActiveCfg = Release|Win32

 		{53F841E8-284F-4545-9176-B131896E43F8}.Release|Win32.Build.0 = Release|Win32

 		{53F841E8-284F-4545-9176-B131896E43F8}.Release|x64.ActiveCfg = Release|Win32

@@ -1654,7 +1656,8 @@ Global
 		{2E0A2793-94C3-82E7-2AB0-FD421816CFBF}.Release|x64.Build.0 = Release|x64

 		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Debug|Win32.ActiveCfg = Debug|Win32

 		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Debug|Win32.Build.0 = Debug|Win32

-		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Debug|x64.ActiveCfg = Debug|Win32

+		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Debug|x64.ActiveCfg = Debug|x64

+		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Debug|x64.Build.0 = Debug|x64

 		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Release|Win32.ActiveCfg = Release|Win32

 		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Release|Win32.Build.0 = Release|Win32

 		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Release|x64.ActiveCfg = Release|Win32

diff --git a/plugins/CyrTranslit/TransliterationProtocol.cpp b/plugins/CyrTranslit/TransliterationProtocol.cpp
index b0ba2c12d7..1af06afef4 100644
--- a/plugins/CyrTranslit/TransliterationProtocol.cpp
+++ b/plugins/CyrTranslit/TransliterationProtocol.cpp
@@ -121,14 +121,7 @@ INT_PTR TransliterationProtocol::sendMessageA(WPARAM wParam, LPARAM lParam)
 

 	if(ccs->wParam & PREF_UTF)

 	{

-		if(utfi.utf8_decode != 0)

-		{

-			TranslateMessageUTF(wParam, lParam);

-		}

-		else

-		{

-			msgProcessed = false;

-		}

+		TranslateMessageUTF(wParam, lParam);

 	}

 	else if(ccs->wParam & PREF_UNICODE)

 	{

diff --git a/plugins/mir_core/mir_core_10.vcxproj b/plugins/mir_core/mir_core_10.vcxproj
index ba1b174e58..60bb2b1708 100644
--- a/plugins/mir_core/mir_core_10.vcxproj
+++ b/plugins/mir_core/mir_core_10.vcxproj
@@ -139,8 +139,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <ModuleDefinitionFile>

-      </ModuleDefinitionFile>

+      <ModuleDefinitionFile>mir_core.def</ModuleDefinitionFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

@@ -200,8 +199,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <ModuleDefinitionFile>

-      </ModuleDefinitionFile>

+      <ModuleDefinitionFile>mir_core.def</ModuleDefinitionFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>