From 7ca0277c12724173c8951f7db3d06edc33231f68 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Sun, 29 Mar 2009 16:20:10 +0000
Subject: x64 portability
git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@440 4f64403b-2f21-0410-a795-97e2b3489a10
---
metacontacts/MetaContacts_9.sln | 6 +
metacontacts/MetaContacts_9.vcproj | 397 ++++++++++++++++++++++++++++++++++++-
metacontacts/addto.c | 6 +-
metacontacts/edit.c | 2 +-
metacontacts/meta_api.c | 36 ++--
metacontacts/meta_menu.c | 54 ++---
metacontacts/meta_options.c | 4 +-
metacontacts/meta_services.c | 44 ++--
metacontacts/meta_utils.c | 8 +-
metacontacts/metacontacts.h | 169 ++++++++--------
10 files changed, 561 insertions(+), 165 deletions(-)
diff --git a/metacontacts/MetaContacts_9.sln b/metacontacts/MetaContacts_9.sln
index 29ed923..6847058 100644
--- a/metacontacts/MetaContacts_9.sln
+++ b/metacontacts/MetaContacts_9.sln
@@ -5,13 +5,19 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Debug|Win32.ActiveCfg = Debug|Win32
{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Debug|Win32.Build.0 = Debug|Win32
+ {8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Debug|x64.ActiveCfg = Debug|x64
+ {8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Debug|x64.Build.0 = Debug|x64
{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Release|Win32.ActiveCfg = Release|Win32
{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Release|Win32.Build.0 = Release|Win32
+ {8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Release|x64.ActiveCfg = Release|x64
+ {8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/metacontacts/MetaContacts_9.vcproj b/metacontacts/MetaContacts_9.vcproj
index bbd2de5..2e0db61 100644
--- a/metacontacts/MetaContacts_9.vcproj
+++ b/metacontacts/MetaContacts_9.vcproj
@@ -1,4 +1,4 @@
-
+
+
@@ -49,7 +52,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PLI_PROTOCOL | PLI_ONLINE | PLI_OFFLINE
* @return an \c HICON in which the icon has been loaded.
*/
-int Meta_LoadIcon(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_LoadIcon(WPARAM wParam,LPARAM lParam)
{
UINT id;
switch (wParam & 0xFFFF)
@@ -186,7 +186,7 @@ void CALLBACK SetStatusThread(HWND hWnd, UINT msg, UINT_PTR id, DWORD dw)
* @param wParam : The new mode
* @param lParam : Allways set to 0.
*/
-int Meta_SetStatus(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_SetStatus(WPARAM wParam,LPARAM lParam)
{
// firstSetOnline starts out true - used to delay metacontact's 'onlineness' to prevent double status notifications on startup
if(mcStatus == ID_STATUS_OFFLINE && firstSetOnline) {
@@ -204,7 +204,7 @@ int Meta_SetStatus(WPARAM wParam,LPARAM lParam)
/** Returns the current status
*/
-int Meta_GetStatus(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_GetStatus(WPARAM wParam,LPARAM lParam)
{
return mcStatus;
}
@@ -258,7 +258,7 @@ static DWORD CALLBACK sttFakeAckFail( LPVOID param )
* @return 0 on success, 1 otherwise.
*/
-int MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam)
+INT_PTR MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam)
{
DBEVENTINFO dbei;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -299,7 +299,7 @@ int MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam)
return CallService(MS_PROTO_CHAINSEND, wParam, lParam);
}
-int Meta_SendNudge(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_SendNudge(WPARAM wParam,LPARAM lParam)
{
HANDLE hMeta = (HANDLE)wParam,
hSubContact = Meta_GetMostOnline(hMeta);
@@ -325,7 +325,7 @@ int Meta_SendNudge(WPARAM wParam,LPARAM lParam)
*
* @return 0 on success, 1 otherwise.
*/
-int Meta_SendMessage(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_SendMessage(WPARAM wParam,LPARAM lParam)
{
DBEVENTINFO dbei;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -419,7 +419,7 @@ int Meta_SendMessage(WPARAM wParam,LPARAM lParam)
*
* @return 0 on success, 1 otherwise.
*/
-int MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
+INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
{
DBEVENTINFO dbei;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -557,7 +557,7 @@ int MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
*
* @return 0
*/
-int Meta_RecvMessage(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_RecvMessage(WPARAM wParam, LPARAM lParam)
{
DBEVENTINFO dbei;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -962,7 +962,7 @@ int Meta_ContactDeleted(WPARAM wParam, LPARAM lParam) {
* @param wParam \c HANDLE to the contact that we are typing to
* @param lParam either PROTOTYPE_SELFTYPING_ON or PROTOTYPE_SELFTYPING_OFF
*/
-int Meta_UserIsTyping(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_UserIsTyping(WPARAM wParam, LPARAM lParam)
{
char *proto;
char buff[512];
@@ -1221,7 +1221,7 @@ int Meta_ClistDoubleClicked(WPARAM wParam, LPARAM lParam) {
return 0;
}
-int Meta_ClistMessageEventClicked(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_ClistMessageEventClicked(WPARAM wParam, LPARAM lParam) {
HANDLE hContact = ((CLISTEVENT *)lParam)->hContact;
@@ -1444,7 +1444,7 @@ static DWORD CALLBACK sttMenuThread( LPVOID param )
return 0;
}
-int Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam) {
HANDLE hContact;
hContact = Meta_GetContactHandle((HANDLE)wParam, (int)lParam);
@@ -1490,7 +1490,7 @@ int Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam) {
// file transfer support - mostly not required, since subcontacts do the receiving
////////////////////
/*
-int Meta_FileResume(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_FileResume(WPARAM wParam, LPARAM lParam)
{
DBVARIANT dbv;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -1527,7 +1527,7 @@ int Meta_FileResume(WPARAM wParam, LPARAM lParam)
return 1; // fail
}
-int Meta_FileAllow(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_FileAllow(WPARAM wParam, LPARAM lParam)
{
DBVARIANT dbv;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -1563,7 +1563,7 @@ int Meta_FileAllow(WPARAM wParam, LPARAM lParam)
return 0; // fail
}
-int Meta_FileDeny(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_FileDeny(WPARAM wParam, LPARAM lParam)
{
DBVARIANT dbv;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -1600,7 +1600,7 @@ int Meta_FileDeny(WPARAM wParam, LPARAM lParam)
return 1; // fail
}
-int Meta_FileRecv(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_FileRecv(WPARAM wParam, LPARAM lParam)
{
DBVARIANT dbv;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -1676,7 +1676,7 @@ int Meta_FileCancel(WPARAM wParam, LPARAM lParam)
}
*/
-int Meta_FileSend(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_FileSend(WPARAM wParam, LPARAM lParam)
{
CCSDATA *ccs = (CCSDATA *) lParam;
char *proto = 0;
@@ -1722,7 +1722,7 @@ int Meta_FileSend(WPARAM wParam, LPARAM lParam)
return 0; // fail
}
-int Meta_GetAwayMsg(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_GetAwayMsg(WPARAM wParam, LPARAM lParam) {
CCSDATA *ccs = (CCSDATA *) lParam;
char *proto = 0;
DWORD default_contact_number;
@@ -1755,7 +1755,7 @@ int Meta_GetAwayMsg(WPARAM wParam, LPARAM lParam) {
return 0; // fail
}
-int Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam) {
PROTO_AVATAR_INFORMATION *AI = (PROTO_AVATAR_INFORMATION *) lParam;
char *proto = 0;
DWORD default_contact_number;
@@ -1791,7 +1791,7 @@ int Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam) {
return GAIR_NOAVATAR; // fail
}
-int Meta_GetInfo(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_GetInfo(WPARAM wParam, LPARAM lParam) {
CCSDATA *ccs = (CCSDATA *) lParam;
char *proto = 0;
DWORD default_contact_number;
@@ -1890,7 +1890,7 @@ int Meta_CallMostOnline(WPARAM wParam, LPARAM lParam) {
}
-int Meta_OnOff(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_OnOff(WPARAM wParam, LPARAM lParam) {
CLISTMENUITEM menu;
menu.cbSize = sizeof(CLISTMENUITEM);
// just write to db - the rest is handled in the Meta_SettingChanged function
diff --git a/metacontacts/meta_utils.c b/metacontacts/meta_utils.c
index 6077117..a61db7e 100644
--- a/metacontacts/meta_utils.c
+++ b/metacontacts/meta_utils.c
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
HANDLE invisiGroup;
POINT menuMousePoint;
-int MyDBWriteContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) {
+INT_PTR MyDBWriteContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) {
DBCONTACTWRITESETTING dcws;
dcws.szModule = szModule;
dcws.szSetting = szSetting;
@@ -36,7 +36,7 @@ int MyDBWriteContactSetting(HANDLE hContact, const char *szModule, const char *s
return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&dcws);
}
-int MyDBGetContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) {
+INT_PTR MyDBGetContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) {
static BOOL strsvc, strsvcset = FALSE;
memset(dbv, 0, sizeof(DBVARIANT));
@@ -1486,7 +1486,7 @@ int Meta_SwapContacts(HANDLE hMeta, DWORD contact_number1, DWORD contact_number2
return 0;
}
-BOOL CALLBACK DlgProcNull(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgProcNull(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch(msg) {
case WM_INITDIALOG:
@@ -1709,7 +1709,7 @@ void Meta_FixStatus(HANDLE hMeta) {
}
-int Meta_IsEnabled() {
+INT_PTR Meta_IsEnabled() {
return DBGetContactSettingByte(0, META_PROTO, "Enabled", 1) && (meta_group_hack_disabled || DBGetContactSettingByte(NULL, "CList", "UseGroups", 1));
}
diff --git a/metacontacts/metacontacts.h b/metacontacts/metacontacts.h
index 9cf64bc..4f0ab1d 100644
--- a/metacontacts/metacontacts.h
+++ b/metacontacts/metacontacts.h
@@ -24,13 +24,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#define _CRT_SECURE_NO_DEPRECATE
-#define _USE_32BIT_TIME_T
#define _WIN32_WINNT 0x0400
#define _WIN32_IE 0x0300
#define MIRANDA_VER 0x0800
+#include
+
#include
#include
#include
@@ -45,29 +46,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "resource.h"
#include "m_metacontacts.h"
-#include "../../include/m_icolib.h"
-
-#include "../../include/newpluginapi.h"
-#include "../../include/m_clist.h"
-#include "../../include/m_clui.h"
-#include "../../include/m_skin.h"
-#include "../../include/m_langpack.h"
-#include "../../include/m_protomod.h"
-#include "../../include/m_database.h"
-#include "../../include/m_system.h"
-#include "../../include/m_protocols.h"
-#include "../../include/m_userinfo.h"
-#include "../../include/m_options.h"
-#include "../../include/m_protosvc.h"
-#include "../../include/m_utils.h"
-#include "../../include/m_ignore.h"
-#include "../../include/m_clc.h"
-#include "../../include/m_contacts.h"
-#include "../../include/m_message.h"
-#include "../../include/m_ignore.h"
-#include "../../include/m_langpack.h"
-#include "../../include/m_popup.h"
-#include "../../include/m_cluiframes.h"
+#include "m_icolib.h"
+
+#include "newpluginapi.h"
+#include "m_clist.h"
+#include "m_clui.h"
+#include "m_skin.h"
+#include "m_langpack.h"
+#include "m_protomod.h"
+#include "m_database.h"
+#include "m_system.h"
+#include "m_protocols.h"
+#include "m_userinfo.h"
+#include "m_options.h"
+#include "m_protosvc.h"
+#include "m_utils.h"
+#include "m_ignore.h"
+#include "m_clc.h"
+#include "m_contacts.h"
+#include "m_message.h"
+#include "m_ignore.h"
+#include "m_langpack.h"
+#include "m_popup.h"
+#include "m_cluiframes.h"
#include "../updater/m_updater.h"
#define META_PROTO "MetaContacts"
@@ -81,29 +82,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// I can't think of a way around this - mental block
-int TranslateMenuFunc(HANDLE hContact, int i);
+INT_PTR TranslateMenuFunc(HANDLE hContact, int i);
extern HANDLE hMenuContact[MAX_CONTACTS];
-int MenuFunc0(WPARAM wParam, LPARAM lParam);
-int MenuFunc1(WPARAM wParam, LPARAM lParam);
-int MenuFunc2(WPARAM wParam, LPARAM lParam);
-int MenuFunc3(WPARAM wParam, LPARAM lParam);
-int MenuFunc4(WPARAM wParam, LPARAM lParam);
-int MenuFunc5(WPARAM wParam, LPARAM lParam);
-int MenuFunc6(WPARAM wParam, LPARAM lParam);
-int MenuFunc7(WPARAM wParam, LPARAM lParam);
-int MenuFunc8(WPARAM wParam, LPARAM lParam);
-int MenuFunc9(WPARAM wParam, LPARAM lParam);
-int MenuFunc10(WPARAM wParam, LPARAM lParam);
-int MenuFunc11(WPARAM wParam, LPARAM lParam);
-int MenuFunc12(WPARAM wParam, LPARAM lParam);
-int MenuFunc13(WPARAM wParam, LPARAM lParam);
-int MenuFunc14(WPARAM wParam, LPARAM lParam);
-int MenuFunc15(WPARAM wParam, LPARAM lParam);
-int MenuFunc16(WPARAM wParam, LPARAM lParam);
-int MenuFunc17(WPARAM wParam, LPARAM lParam);
-int MenuFunc18(WPARAM wParam, LPARAM lParam);
-int MenuFunc19(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc0(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc1(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc2(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc3(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc4(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc5(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc6(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc7(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc8(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc9(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc10(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc11(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc12(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc13(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc14(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc15(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc16(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc17(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc18(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc19(WPARAM wParam, LPARAM lParam);
extern HINSTANCE hInstance;
extern PLUGININFOEX pluginInfo;
@@ -124,15 +125,15 @@ extern int mcStatus;
extern HANDLE metaMainThread;
-int Meta_Convert(WPARAM wParam,LPARAM lParam);
-int Meta_AddTo(WPARAM wParam,LPARAM lParam);
-int Meta_Edit(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_Convert(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_AddTo(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_Edit(WPARAM wParam,LPARAM lParam);
void Meta_RemoveContactNumber(HANDLE hMeta, int number);
-int Meta_Delete(WPARAM wParam,LPARAM lParam);
-int Meta_Default(WPARAM wParam,LPARAM lParam);
-int Meta_ForceDefault(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_Delete(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_Default(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_ForceDefault(WPARAM wParam,LPARAM lParam);
-int Meta_IsEnabled();
+INT_PTR Meta_IsEnabled();
int Meta_EqualDBV(DBVARIANT *dbv, DBVARIANT *id);
int Meta_ModifyMenu(WPARAM wParam,LPARAM lParam);
@@ -164,17 +165,17 @@ void Meta_FixStatus(HANDLE hMeta);
char *Meta_GetUniqueIdentifier(HANDLE hContact, DWORD *pused);
-int Meta_GetCaps(WPARAM wParam,LPARAM lParam);
-int Meta_GetName(WPARAM wParam,LPARAM lParam);
-int Meta_LoadIcon(WPARAM wParam,LPARAM lParam);
-int Meta_SetStatus(WPARAM wParam,LPARAM lParam);
-int Meta_GetStatus(WPARAM wParam,LPARAM lParam);
-int Meta_SendMessage(WPARAM wParam,LPARAM lParam);
-int Meta_RecvMessage(WPARAM wParam,LPARAM lParam);
-int Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam);
+INT_PTR Meta_GetCaps(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_GetName(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_LoadIcon(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_SetStatus(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_GetStatus(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_SendMessage(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_RecvMessage(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
void Meta_InitServices();
void Meta_CloseHandles();
@@ -207,8 +208,8 @@ typedef struct tag_MetaOptions {
extern MetaOptions options;
-BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK DlgProcOptsPriorities(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK DlgProcOptsPriorities(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
int Meta_WriteOptions(MetaOptions *opt);
int Meta_ReadOptions(MetaOptions *opt);
@@ -216,28 +217,28 @@ int GetDefaufaultPrio(int status);
int GetRealPriority(char *proto, int status);
// API function headers
-int MetaAPI_GetMeta(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetDefault(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetDefaultNum(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetMostOnline(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetNumContacts(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetContact(WPARAM wParam, LPARAM lParam);
-int MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam);
-int MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam);
-int MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam);
-int MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam);
-int MetaAPI_UnforceSendContact(WPARAM wParam, LPARAM lParam);
-int MetaAPI_ForceDefault(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam);
-int MetaAPI_ConvertToMeta(WPARAM wParam, LPARAM lParam);
-int MetaAPI_AddToMeta(WPARAM wParam, LPARAM lParam);
-int MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam);
-int MetaAPI_DisableHiddenGroup(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetMeta(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetDefault(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetDefaultNum(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetMostOnline(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetNumContacts(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetContact(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_UnforceSendContact(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_ForceDefault(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_ConvertToMeta(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_AddToMeta(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_DisableHiddenGroup(WPARAM wParam, LPARAM lParam);
// extended db get/write setting functions, that handle unicode
-int MyDBWriteContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);
-int MyDBGetContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);
+INT_PTR MyDBWriteContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);
+INT_PTR MyDBGetContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);
// IcoLib support
void InitIcons(void);
--
cgit v1.2.3