x64 portability

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

1 files changed, 27 insertions, 27 deletions

diff --git a/metacontacts/meta_menu.c b/metacontacts/meta_menu.c
index 4165c3b..36caabf 100644
--- a/metacontacts/meta_menu.c
+++ b/metacontacts/meta_menu.c
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 * @param wParam :	\c HANDLE to the contact that has been chosen.

 * @param lParam :	Allways set to 0.

 */

-int Meta_Convert(WPARAM wParam,LPARAM lParam)

+INT_PTR Meta_Convert(WPARAM wParam,LPARAM lParam)

 {

 	HANDLE hMetaContact;

 	DBVARIANT dbv;

@@ -97,7 +97,7 @@ int Meta_Convert(WPARAM wParam,LPARAM lParam)
 * @param wParam :	\c HANDLE to the contact that has been chosen.

 * @param lParam :	Allways set to 0.

 */

-int Meta_AddTo(WPARAM wParam, LPARAM lParam)

+INT_PTR Meta_AddTo(WPARAM wParam, LPARAM lParam)

 {

 	HWND clui = (HWND)CallService(MS_CLUI_GETHWND,0,0);

 	DialogBoxParam(hInstance,MAKEINTRESOURCE(IDD_METASELECT),clui,&Meta_SelectDialogProc,(LPARAM)wParam);

@@ -111,7 +111,7 @@ int Meta_AddTo(WPARAM wParam, LPARAM lParam)
 * @param wParam :	\c HANDLE to the MetaContact to be edited.

 * @param lParam :	Allways set to 0.

 */

-int Meta_Edit(WPARAM wParam,LPARAM lParam)

+INT_PTR Meta_Edit(WPARAM wParam,LPARAM lParam)

 {

 	HWND clui = (HWND)CallService(MS_CLUI_GETHWND,0,0);

 	DialogBoxParam(hInstance,MAKEINTRESOURCE(IDD_METAEDIT),clui,Meta_EditDialogProc,(LPARAM)wParam);

@@ -245,7 +245,7 @@ void Meta_RemoveContactNumber(HANDLE hMeta, int number) {
 * @param wParam :	\c HANDLE to the MetaContact to be deleted, or to the subcontact to be removed from the MetaContact

 * @param lParam :	\c BOOL flag indicating whether to ask 'are you sure' when deleting a MetaContact

 */

-int Meta_Delete(WPARAM wParam,LPARAM lParam)

+INT_PTR Meta_Delete(WPARAM wParam,LPARAM lParam)

 {

 	DWORD metaID;

 	HANDLE hContact;

@@ -323,7 +323,7 @@ int Meta_Delete(WPARAM wParam,LPARAM lParam)
 * @param lParam :	\c HWND to the clist window

 					(This means the function has been called via the contact menu).

 */

-int Meta_Default(WPARAM wParam,LPARAM lParam)

+INT_PTR Meta_Default(WPARAM wParam,LPARAM lParam)

 {

 	HANDLE hMeta;

 

@@ -343,7 +343,7 @@ int Meta_Default(WPARAM wParam,LPARAM lParam)
 * @param lParam :	\c HWND to the clist window

 					(This means the function has been called via the contact menu).

 */

-int Meta_ForceDefault(WPARAM wParam,LPARAM lParam)

+INT_PTR Meta_ForceDefault(WPARAM wParam,LPARAM lParam)

 {

 	if(DBGetContactSettingDword((HANDLE)wParam,META_PROTO, META_ID, (DWORD)-1) != (DWORD)-1)

 	{ // the wParam is a MetaContact

@@ -360,30 +360,30 @@ int Meta_ForceDefault(WPARAM wParam,LPARAM lParam)
 	return 0;

 }

 

-int MenuFunc0(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 0);}

-int MenuFunc1(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 1);}

-int MenuFunc2(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 2);}

-int MenuFunc3(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 3);}

-int MenuFunc4(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 4);}

-int MenuFunc5(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 5);}

-int MenuFunc6(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 6);}

-int MenuFunc7(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 7);}

-int MenuFunc8(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 8);}

-int MenuFunc9(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 9);}

-int MenuFunc10(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 10);}

-int MenuFunc11(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 11);}

-int MenuFunc12(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 12);}

-int MenuFunc13(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 13);}

-int MenuFunc14(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 14);}

-int MenuFunc15(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 15);}

-int MenuFunc16(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 16);}

-int MenuFunc17(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 17);}

-int MenuFunc18(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 18);}

-int MenuFunc19(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 19);}

+INT_PTR MenuFunc0(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 0);}

+INT_PTR MenuFunc1(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 1);}

+INT_PTR MenuFunc2(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 2);}

+INT_PTR MenuFunc3(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 3);}

+INT_PTR MenuFunc4(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 4);}

+INT_PTR MenuFunc5(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 5);}

+INT_PTR MenuFunc6(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 6);}

+INT_PTR MenuFunc7(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 7);}

+INT_PTR MenuFunc8(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 8);}

+INT_PTR MenuFunc9(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 9);}

+INT_PTR MenuFunc10(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 10);}

+INT_PTR MenuFunc11(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 11);}

+INT_PTR MenuFunc12(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 12);}

+INT_PTR MenuFunc13(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 13);}

+INT_PTR MenuFunc14(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 14);}

+INT_PTR MenuFunc15(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 15);}

+INT_PTR MenuFunc16(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 16);}

+INT_PTR MenuFunc17(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 17);}

+INT_PTR MenuFunc18(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 18);}

+INT_PTR MenuFunc19(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 19);}

 

 HANDLE hMenuContact[MAX_CONTACTS];

 

-int TranslateMenuFunc(HANDLE hMeta, int contact_number) {

+INT_PTR TranslateMenuFunc(HANDLE hMeta, int contact_number) {

 	return Meta_ContactMenuFunc((WPARAM)hMeta, (LPARAM) contact_number);

 }