From db8b815e030a26624fe80150ec6775ac716647cf Mon Sep 17 00:00:00 2001 From: "george.hazan" Date: Fri, 22 Apr 2011 13:36:58 +0000 Subject: patch for 64-bit compilation (by wishmaster) git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@13 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- gtalkext/GTalkExt.vcxproj | 169 +++++++++++++++++++++++++++++++++++++++++++-- gtalkext/inbox.cpp | 6 +- gtalkext/notifications.cpp | 2 +- 3 files changed, 169 insertions(+), 8 deletions(-) diff --git a/gtalkext/GTalkExt.vcxproj b/gtalkext/GTalkExt.vcxproj index e2f4aff..513becd 100644 --- a/gtalkext/GTalkExt.vcxproj +++ b/gtalkext/GTalkExt.vcxproj @@ -5,18 +5,34 @@ Debug Unicode Win32 + + Debug Unicode + x64 + Debug Win32 + + Debug + x64 + Release Unicode Win32 + + Release Unicode + x64 + Release Win32 + + Release + x64 + {2A737817-2443-48FF-A2E8-CA8D69E450F3} @@ -29,66 +45,120 @@ MultiByte true + + DynamicLibrary + MultiByte + true + DynamicLibrary Unicode true + + DynamicLibrary + Unicode + true + DynamicLibrary MultiByte + + DynamicLibrary + MultiByte + DynamicLibrary Unicode + + DynamicLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Plugins\ $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ true + true true + true $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Plugins\ $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ false + false false + false AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + Disabled - ../../include + ../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -105,10 +175,28 @@ MachineX86 + + + Disabled + ../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + + + LinkVerbose + %(AdditionalLibraryDirectories) + true + Windows + + Disabled - ../../include + ../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -125,6 +213,24 @@ MachineX86 + + + Disabled + ../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + Level3 + ProgramDatabase + + + LinkVerbose + %(AdditionalLibraryDirectories) + true + Windows + + MaxSpeed @@ -135,7 +241,7 @@ Use Level3 ProgramDatabase - ../../include + ../../include;%(AdditionalIncludeDirectories) true @@ -145,6 +251,25 @@ MachineX86 + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Use + Level3 + ProgramDatabase + ../../include;%(AdditionalIncludeDirectories) + + + true + Windows + true + true + + Full @@ -154,7 +279,7 @@ Use Level3 ProgramDatabase - ../../include + ../../include;%(AdditionalIncludeDirectories) Size true @@ -166,22 +291,54 @@ MachineX86 + + + Full + WIN32;NDEBUG;_WINDOWS;_USRDLL;GTALKEXT_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Use + Level3 + ProgramDatabase + ../../include;%(AdditionalIncludeDirectories) + Size + true + + + true + Windows + true + true + + + + + + false + false false + false + + + + false + false false + false @@ -192,9 +349,13 @@ Create + Create Create + Create Create + Create Create + Create diff --git a/gtalkext/inbox.cpp b/gtalkext/inbox.cpp index 54be1d5..449cdde 100644 --- a/gtalkext/inbox.cpp +++ b/gtalkext/inbox.cpp @@ -28,19 +28,19 @@ static const LPTSTR COMMON_GMAIL_HOST1 = _T("gmail.com"); static const LPTSTR COMMON_GMAIL_HOST2 = _T("googlemail.com"); -static const LPSTR AUTH_REQUEST_URL = "https://google.com/accounts/ClientAuth"; +static const LPSTR AUTH_REQUEST_URL = "https://www.google.com/accounts/ClientAuth"; static const LPSTR AUTH_REQUEST_PARAMS = "Email=%s&Passwd=%s&" "accountType=HOSTED_OR_GOOGLE&" "skipvpage=true&" "PersistentCookie=false"; -static const LPSTR ISSUE_TOKEN_REQUEST_URL = "https://google.com/accounts/IssueAuthToken"; +static const LPSTR ISSUE_TOKEN_REQUEST_URL = "https://www.google.com/accounts/IssueAuthToken"; static const LPSTR ISSUE_TOKEN_REQUEST_PARAMS = "SID=%s&LSID=%s&" "Session=true&" "skipvpage=true&" "service=gaia"; -static const LPSTR TOKEN_AUTH_URL = "https://google.com/accounts/TokenAuth?"\ +static const LPSTR TOKEN_AUTH_URL = "https://www.google.com/accounts/TokenAuth?"\ "auth=%s&" "service=mail&" "continue=%s&" diff --git a/gtalkext/notifications.cpp b/gtalkext/notifications.cpp index a47a2bf..70c15ce 100644 --- a/gtalkext/notifications.cpp +++ b/gtalkext/notifications.cpp @@ -103,7 +103,7 @@ void MarkEventRead(HANDLE hCnt, HANDLE hEvt) } -INT_PTR OnEventDeleted(WPARAM hContact, LPARAM hDbEvent, LPARAM wnd) +int OnEventDeleted(WPARAM hContact, LPARAM hDbEvent, LPARAM wnd) { if (DBGetContactSettingByte((HANDLE)hContact, SHORT_PLUGIN_NAME, PSEUDOCONTACT_FLAG, 0)) { CallService(MS_CLIST_REMOVEEVENT, hContact, hDbEvent); -- cgit v1.2.3