x64 portability

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@440 4f64403b-2f21-0410-a795-97e2b3489a10

1 files changed, 85 insertions, 84 deletions

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 <m_stdhdr.h>

+

 #include <windows.h>

 #include <winsock.h>

 #include <winbase.h>

@@ -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);