diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-10 10:04:16 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-10 10:04:16 +0000 |
| commit | ddf46f560f63f43aedc6464edad759cc3a711d4b (patch) | |
| tree | d28752a25425c57ffb726f062963cb7edb337001 /plugins/CyrTranslit | |
| parent | 3730671c0735c834098e24d9b03a501e521e0c90 (diff) | |
64-bit compilation issues
git-svn-id: http://svn.miranda-ng.org/main/trunk@376 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/CyrTranslit')
| -rw-r--r-- | plugins/CyrTranslit/MirandaContact.cpp | 5 | ||||
| -rw-r--r-- | plugins/CyrTranslit/MirandaContact.h | 2 | ||||
| -rw-r--r-- | plugins/CyrTranslit/TransliterationProtocol.cpp | 4 | ||||
| -rw-r--r-- | plugins/CyrTranslit/TransliterationProtocol.h | 46 |
4 files changed, 28 insertions, 29 deletions
diff --git a/plugins/CyrTranslit/MirandaContact.cpp b/plugins/CyrTranslit/MirandaContact.cpp index ca1f959f4b..0906db3769 100644 --- a/plugins/CyrTranslit/MirandaContact.cpp +++ b/plugins/CyrTranslit/MirandaContact.cpp @@ -54,8 +54,7 @@ MirandaContact::~MirandaContact() void MirandaContact::initialize()
{
- CreateServiceFunction(
- MENU_COMMAND_CALLBACK_SERVICE,onMenuCommandTransliterate);
+ CreateServiceFunction(MENU_COMMAND_CALLBACK_SERVICE,onMenuCommandTransliterate);
generateMenuItemsForAllContacts();
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, onPreBuildContactMenu);
@@ -148,7 +147,7 @@ void MirandaContact::activateTransliterationProtocolForSubscribedContacts() //------------------------------------------------------------------------------
-int MirandaContact::onMenuCommandTransliterate(WPARAM wParam, LPARAM lParam)
+INT_PTR MirandaContact::onMenuCommandTransliterate(WPARAM wParam, LPARAM lParam)
{
HANDLE hContact = reinterpret_cast<HANDLE>(wParam);
if(!CallService(MS_DB_CONTACT_IS, wParam, 0)) return 0;
diff --git a/plugins/CyrTranslit/MirandaContact.h b/plugins/CyrTranslit/MirandaContact.h index 4c0106e972..0e29f3d74e 100644 --- a/plugins/CyrTranslit/MirandaContact.h +++ b/plugins/CyrTranslit/MirandaContact.h @@ -83,7 +83,7 @@ private: * @param lParam hwndContactList
* @return Always returns 0.
*/
- static int onMenuCommandTransliterate(WPARAM wParam, LPARAM lParam);
+ static INT_PTR onMenuCommandTransliterate(WPARAM wParam, LPARAM lParam);
/**
* This is a service name to bind the onMenuCommandTransliterate() method to
diff --git a/plugins/CyrTranslit/TransliterationProtocol.cpp b/plugins/CyrTranslit/TransliterationProtocol.cpp index f6920c465a..b0ba2c12d7 100644 --- a/plugins/CyrTranslit/TransliterationProtocol.cpp +++ b/plugins/CyrTranslit/TransliterationProtocol.cpp @@ -97,7 +97,7 @@ void TransliterationProtocol::TranslateMessageA(WPARAM wParam, LPARAM lParam) strcpy(reinterpret_cast<char*>(ccs->lParam), txt.c_str());
}
-int TransliterationProtocol::sendMessageW(WPARAM wParam, LPARAM lParam)
+INT_PTR TransliterationProtocol::sendMessageW(WPARAM wParam, LPARAM lParam)
{
CCSDATA *ccs = reinterpret_cast<CCSDATA*>(lParam);
LPARAM oldlParam = ccs->lParam;
@@ -113,7 +113,7 @@ int TransliterationProtocol::sendMessageW(WPARAM wParam, LPARAM lParam) }
//------------------------------------------------------------------------------
-int TransliterationProtocol::sendMessageA(WPARAM wParam, LPARAM lParam)
+INT_PTR TransliterationProtocol::sendMessageA(WPARAM wParam, LPARAM lParam)
{
CCSDATA *ccs = reinterpret_cast<CCSDATA*>(lParam);
LPARAM oldlParam = ccs->lParam;
diff --git a/plugins/CyrTranslit/TransliterationProtocol.h b/plugins/CyrTranslit/TransliterationProtocol.h index bc472c4c85..52d9fc0e74 100644 --- a/plugins/CyrTranslit/TransliterationProtocol.h +++ b/plugins/CyrTranslit/TransliterationProtocol.h @@ -31,34 +31,34 @@ namespace CyrTranslit class TransliterationProtocol
{
public:
- /**
- * Initializes this protocol on Miranda start-up.
- */
- static void initialize();
-
- /**
- * A call-back function called when a new outgoing message must be
- * transferred by this protocol.
- *
- * @param wParam flags
- * @param lParam (LPARAM)(const char*)szMessage
- * @return a hProcess corresponding to the one in the ack event.
- */
- static int sendMessageA(WPARAM wParam, LPARAM lParam);
- static int sendMessageW(WPARAM wParam, LPARAM lParam);
+ /**
+ * Initializes this protocol on Miranda start-up.
+ */
+ static void initialize();
+
+ /**
+ * A call-back function called when a new outgoing message must be
+ * transferred by this protocol.
+ *
+ * @param wParam flags
+ * @param lParam (LPARAM)(const char*)szMessage
+ * @return a hProcess corresponding to the one in the ack event.
+ */
+ static INT_PTR sendMessageA(WPARAM wParam, LPARAM lParam);
+ static INT_PTR sendMessageW(WPARAM wParam, LPARAM lParam);
static void TranslateMessageA(WPARAM wParam, LPARAM lParam);
- static void TranslateMessageW(WPARAM wParam, LPARAM lParam);
- static void TranslateMessageUTF(WPARAM wParam, LPARAM lParam);
-
- static void activateForContact(HANDLE hContact);
- static void deactivateForContact(HANDLE hContact);
+ static void TranslateMessageW(WPARAM wParam, LPARAM lParam);
+ static void TranslateMessageUTF(WPARAM wParam, LPARAM lParam);
+
+ static void activateForContact(HANDLE hContact);
+ static void deactivateForContact(HANDLE hContact);
private:
- static char *MODULE_NAME;
+ static char *MODULE_NAME;
- TransliterationProtocol();
- ~TransliterationProtocol();
+ TransliterationProtocol();
+ ~TransliterationProtocol();
};
}
\ No newline at end of file |