HCONTACT is not needed anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 49 insertions, 49 deletions

diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp
index 549d959a92..6c9951e3ff 100644
--- a/plugins/SMS/src/SMS_svc.cpp
+++ b/plugins/SMS/src/SMS_svc.cpp
@@ -54,7 +54,7 @@ int LoadModules(void)
 

 int SmsRebuildContactMenu(WPARAM wParam,LPARAM lParam)

 {

-	Menu_ShowItem(ssSMSSettings.hContactMenuItems[0], GetContactPhonesCount((HCONTACT)wParam));

+	Menu_ShowItem(ssSMSSettings.hContactMenuItems[0], GetContactPhonesCount((MCONTACT)wParam));

 	return 0;

 }

 

@@ -65,11 +65,11 @@ int SendSMSMenuCommand(WPARAM wParam,LPARAM lParam)
 

 	// user clicked on the "SMS Message" on one of the users

 	if (wParam) {

-		hwndSendSms = SendSMSWindowIsOtherInstanceHContact((HCONTACT)wParam);

+		hwndSendSms = SendSMSWindowIsOtherInstanceHContact((MCONTACT)wParam);

 		if (hwndSendSms)

 			SetFocus(hwndSendSms);

 		else

-			hwndSendSms = SendSMSWindowAdd((HCONTACT)wParam);

+			hwndSendSms = SendSMSWindowAdd((MCONTACT)wParam);

 	}

 	// user clicked on the "SMS Send" in the Main Menu

 	else{

@@ -77,7 +77,7 @@ int SendSMSMenuCommand(WPARAM wParam,LPARAM lParam)
 		EnableWindow(GetDlgItem(hwndSendSms,IDC_NAME),TRUE);

 		EnableWindow(GetDlgItem(hwndSendSms,IDC_SAVENUMBER),FALSE);

 

-		for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+		for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 			if (GetContactPhonesCount(hContact)) {

 				SendDlgItemMessage(hwndSendSms,IDC_NAME,CB_ADDSTRING,0,(LPARAM)GetContactNameW(hContact));

 				SendSMSWindowSMSContactAdd(hwndSendSms,hContact);

@@ -134,7 +134,7 @@ void RestoreUnreadMessageAlerts(void)
 {

 	DBEVENTINFO dbei = { sizeof(dbei) };

 

-	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

+	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

 		for (HANDLE hDbEvent = db_event_firstUnread(hContact); hDbEvent; hDbEvent = db_event_next(hDbEvent)) {

 			dbei.cbBlob = 0;

 			if (db_event_get(hDbEvent, &dbei) == 0)

diff --git a/plugins/SMS/src/common.h b/plugins/SMS/src/common.h
index ae468ebcc6..9256139ea4 100644
--- a/plugins/SMS/src/common.h
+++ b/plugins/SMS/src/common.h
@@ -92,25 +92,25 @@ extern SMS_SETTINGS ssSMSSettings;
 #define DB_SMS_SetWord(Contact,valueName,parValue) db_set_w(Contact,PROTOCOL_NAMEA,valueName,parValue)

 #define DB_SMS_GetByte(Contact,valueName,parDefltValue) db_get_b(Contact,PROTOCOL_NAMEA,valueName,parDefltValue)

 #define DB_SMS_SetByte(Contact,valueName,parValue) db_set_b(Contact,PROTOCOL_NAMEA,valueName,parValue)

-BOOL	DB_GetStaticStringW(HCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,LPWSTR lpszRetBuff,SIZE_T dwRetBuffSize,SIZE_T *pdwRetBuffSize);

+BOOL	DB_GetStaticStringW(MCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,LPWSTR lpszRetBuff,SIZE_T dwRetBuffSize,SIZE_T *pdwRetBuffSize);

 #define DB_SMS_GetStaticStringW(Contact,ValueName,Ret,RetBuffSize,pRetBuffSize) DB_GetStaticStringW(Contact,PROTOCOL_NAMEA,ValueName,Ret,RetBuffSize,pRetBuffSize)

 #define DB_SetStringW(Contact,Module,valueName,parValue) db_set_ws(Contact,Module,valueName,parValue)

 #define DB_SMS_SetStringW(Contact,valueName,parValue) db_set_ws(Contact,PROTOCOL_NAMEA,valueName,parValue)

 

 LRESULT CALLBACK MessageSubclassProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam);

 

-LPSTR  GetModuleName(HCONTACT hContact);

+LPSTR  GetModuleName(MCONTACT hContact);

 void   EnableControlsArray(HWND hWndDlg,WORD *pwControlsList,SIZE_T dwControlsListCount,BOOL bEnabled);

 

 // Declaration of function that returns received string with only numbers

 SIZE_T CopyNumberA(LPSTR lpszOutBuff,LPSTR lpszBuff,SIZE_T dwLen);

 SIZE_T CopyNumberW(LPWSTR lpcOutBuff,LPWSTR lpcBuff,SIZE_T dwLen);

 bool   IsPhoneW(LPWSTR lpwszString,SIZE_T dwStringLen);

-DWORD  GetContactPhonesCount(HCONTACT hContact);

-BOOL   IsContactPhone(HCONTACT hContact,LPWSTR lpwszPhone,SIZE_T dwPhoneSize);

+DWORD  GetContactPhonesCount(MCONTACT hContact);

+BOOL   IsContactPhone(MCONTACT hContact,LPWSTR lpwszPhone,SIZE_T dwPhoneSize);

 

 // Declaration of function that returns HANDLE of contact by his cellular number

-HCONTACT HContactFromPhone(LPWSTR lpwszPhone,SIZE_T dwPhoneSize);

+MCONTACT HContactFromPhone(LPWSTR lpwszPhone,SIZE_T dwPhoneSize);

 BOOL     GetDataFromMessage(LPSTR lpszMessage,SIZE_T dwMessageSize,DWORD *pdwEventType,LPWSTR lpwszPhone,SIZE_T dwPhoneSize,SIZE_T *pdwPhoneSizeRet,UINT *piIcon);

 

 // Declaration of function that gets a XML string and return the asked tag.

diff --git a/plugins/SMS/src/functions.cpp b/plugins/SMS/src/functions.cpp
index d560ad733c..48c7abc01f 100644
--- a/plugins/SMS/src/functions.cpp
+++ b/plugins/SMS/src/functions.cpp
@@ -1,6 +1,6 @@
 #include "common.h"

 

-BOOL DB_GetStaticStringW(HCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,LPWSTR lpwszRetBuff,SIZE_T dwRetBuffSize,SIZE_T *pdwRetBuffSize)

+BOOL DB_GetStaticStringW(MCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,LPWSTR lpwszRetBuff,SIZE_T dwRetBuffSize,SIZE_T *pdwRetBuffSize)

 {// sizes in wchars

 	BOOL bRet=FALSE;

 	SIZE_T dwReadedStringLen;

@@ -26,7 +26,7 @@ BOOL DB_GetStaticStringW(HCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,
 	return(bRet);

 }

 

-LPSTR GetModuleName(HCONTACT hContact)

+LPSTR GetModuleName(MCONTACT hContact)

 {

 	LPSTR lpszRet;

 

@@ -92,7 +92,7 @@ bool IsPhoneW(LPWSTR lpwszString,SIZE_T dwStringLen)
 }

 

 

-DWORD GetContactPhonesCountParam(HCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName)

+DWORD GetContactPhonesCountParam(MCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName)

 {

 	DWORD dwRet=0;

 	char szBuff[MAX_PATH];

@@ -113,7 +113,7 @@ DWORD GetContactPhonesCountParam(HCONTACT hContact,LPSTR lpszModule,LPSTR lpszVa
 }

 

 

-DWORD GetContactPhonesCount(HCONTACT hContact)

+DWORD GetContactPhonesCount(MCONTACT hContact)

 {

 	DWORD dwRet = 0;

 	LPSTR lpszProto = GetContactProto(hContact);

@@ -130,7 +130,7 @@ DWORD GetContactPhonesCount(HCONTACT hContact)
 }

 

 

-BOOL IsContactPhoneParam(HCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,LPWSTR lpwszPhone,SIZE_T dwPhoneSize)

+BOOL IsContactPhoneParam(MCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,LPWSTR lpwszPhone,SIZE_T dwPhoneSize)

 {

 	char szBuff[MAX_PATH];

 	WCHAR wszPhoneLocal[MAX_PHONE_LEN];

@@ -157,7 +157,7 @@ BOOL IsContactPhoneParam(HCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,
 }

 

 

-BOOL IsContactPhone(HCONTACT hContact,LPWSTR lpwszPhone,SIZE_T dwPhoneSize)

+BOOL IsContactPhone(MCONTACT hContact,LPWSTR lpwszPhone,SIZE_T dwPhoneSize)

 {

 	BOOL bRet=FALSE;

 	WCHAR wszPhoneLocal[MAX_PHONE_LEN];

@@ -181,11 +181,11 @@ BOOL IsContactPhone(HCONTACT hContact,LPWSTR lpwszPhone,SIZE_T dwPhoneSize)
 //This function get a string cellular number and return the HANDLE of the contact that has this

 //number in the miranda phonebook (and marked as an SMS able) at the User Details.

 //If no one has this number function returns NULL.

-HCONTACT HContactFromPhone(LPWSTR lpwszPhone,SIZE_T dwPhoneSize)

+MCONTACT HContactFromPhone(LPWSTR lpwszPhone,SIZE_T dwPhoneSize)

 {

 	if (lpwszPhone && dwPhoneSize) {

 		//check not already on list

-		for (HCONTACT hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact))

+		for (MCONTACT hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact))

 			if (IsContactPhone(hContact,lpwszPhone,dwPhoneSize))

 				return hContact;

 	}

diff --git a/plugins/SMS/src/receive.cpp b/plugins/SMS/src/receive.cpp
index e6f647adc6..0e619ea6c2 100644
--- a/plugins/SMS/src/receive.cpp
+++ b/plugins/SMS/src/receive.cpp
@@ -60,7 +60,7 @@ int handleAckSMS(WPARAM wParam,LPARAM lParam)
 

 					dwPhoneSize=CopyNumberA(szPhone,lpszPhone,dwPhoneSize);

 					dwPhoneSize=MultiByteToWideChar(CP_UTF8,0,szPhone,dwPhoneSize,tszPhone,MAX_PHONE_LEN);

-					HCONTACT hContact=HContactFromPhone(tszPhone,dwPhoneSize);

+					MCONTACT hContact=HContactFromPhone(tszPhone,dwPhoneSize);

 

 					dbei.szModule=GetModuleName(hContact);

 					dbei.timestamp=time(NULL);

@@ -88,7 +88,7 @@ int handleAckSMS(WPARAM wParam,LPARAM lParam)
 			{

 				dwPhoneSize=CopyNumberA(szPhone,lpszPhone,dwPhoneSize);

 				dwPhoneSize=MultiByteToWideChar(CP_UTF8,0,szPhone,dwPhoneSize,tszPhone,MAX_PHONE_LEN);

-				HCONTACT hContact=HContactFromPhone(tszPhone,dwPhoneSize);

+				MCONTACT hContact=HContactFromPhone(tszPhone,dwPhoneSize);

 

 				DBEVENTINFO dbei={0};

 				dbei.cbSize=sizeof(dbei);

@@ -211,7 +211,7 @@ int handleNewMessage(WPARAM wParam, LPARAM lParam)
 {

 	char szServiceFunction[MAX_PATH], *pszServiceFunctionName;

 	TCHAR szToolTip[MAX_PATH];

-	HCONTACT hContact = (HCONTACT)wParam;

+	MCONTACT hContact = (MCONTACT)wParam;

 	HANDLE hDbEvent = (HANDLE)lParam;

 

 	DBEVENTINFO dbei = { sizeof(dbei) };

diff --git a/plugins/SMS/src/recvdlg.cpp b/plugins/SMS/src/recvdlg.cpp
index eea5b7ca60..db1cdf4093 100644
--- a/plugins/SMS/src/recvdlg.cpp
+++ b/plugins/SMS/src/recvdlg.cpp
@@ -33,7 +33,7 @@ typedef struct
 	LIST_MT_ITEM lmtListMTItem;

 	HWND hWnd;

 	HBRUSH hBkgBrush;

-	HCONTACT hContact;

+	MCONTACT hContact;

 } RECV_SMS_WINDOW_DATA;

 

 INT_PTR CALLBACK	RecvSmsDlgProc	(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM lParam);

@@ -134,7 +134,7 @@ INT_PTR CALLBACK RecvSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 			{

 				WCHAR wszPhone[MAX_PHONE_LEN];

 				HWND hwndSendSms;

-				HCONTACT hContact;

+				MCONTACT hContact;

 

 				hContact=HContactFromPhone(wszPhone,GetDlgItemText(hWndDlg,IDC_NUMBER,wszPhone,SIZEOF(wszPhone)));

 				hwndSendSms=SendSMSWindowIsOtherInstanceHContact(hContact);

@@ -164,7 +164,7 @@ INT_PTR CALLBACK RecvSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 

 //This function create a new SMS receive window, and insert it to the list.

 //The function gets void and return the window HWND

-HWND RecvSMSWindowAdd(HCONTACT hContact,DWORD dwEventType,LPWSTR lpwszPhone,SIZE_T dwPhoneSize,LPSTR lpszMessage,SIZE_T dwMessageSize)

+HWND RecvSMSWindowAdd(MCONTACT hContact,DWORD dwEventType,LPWSTR lpwszPhone,SIZE_T dwPhoneSize,LPSTR lpszMessage,SIZE_T dwMessageSize)

 {

 	HWND hRet=NULL;

 

diff --git a/plugins/SMS/src/recvdlg.h b/plugins/SMS/src/recvdlg.h
index 47363466fe..257fbf7049 100644
--- a/plugins/SMS/src/recvdlg.h
+++ b/plugins/SMS/src/recvdlg.h
@@ -3,7 +3,7 @@
 

 DWORD	RecvSMSWindowInitialize		();

 void	RecvSMSWindowDestroy		();

-HWND	RecvSMSWindowAdd			(HCONTACT hContact,DWORD dwEventType,LPWSTR lpwszPhone,SIZE_T dwPhoneSize,LPSTR lpszMessage,SIZE_T dwMessageSize);

+HWND	RecvSMSWindowAdd			(MCONTACT hContact,DWORD dwEventType,LPWSTR lpwszPhone,SIZE_T dwPhoneSize,LPSTR lpszMessage,SIZE_T dwMessageSize);

 void	RecvSMSWindowRemove			(HWND hWndDlg);

 

 

diff --git a/plugins/SMS/src/senddlg.cpp b/plugins/SMS/src/senddlg.cpp
index e8c32565e7..b5a6285382 100644
--- a/plugins/SMS/src/senddlg.cpp
+++ b/plugins/SMS/src/senddlg.cpp
@@ -40,16 +40,16 @@ typedef struct
 	HWND hWnd;

 	HBRUSH hBkgBrush;

 	HANDLE hProcess;

-	HCONTACT hContact;

-	HCONTACT hMyContact;

+	MCONTACT hContact;

+	MCONTACT hMyContact;

 	HTREEITEM hItemSend;

 	BOOL bMultiple;

 	SIZE_T dwContactsListCount;

-	HCONTACT *phContactsList;

+	MCONTACT *phContactsList;

 	DBEVENTINFO *pdbei;

 } SEND_SMS_WINDOW_DATA;

 

-void			AddContactPhonesToCombo		(HWND hWnd,HCONTACT hContact);

+void			AddContactPhonesToCombo		(HWND hWnd,MCONTACT hContact);

 void			SendSMSWindowFillTreeView	(HWND hWnd);

 SIZE_T			GetSMSMessageLenMax			(HWND hWndDlg);

 

@@ -427,7 +427,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 				SendDlgItemMessage(hWndDlg,IDC_ADDRESS,CB_RESETCONTENT,0,0);

 				if (SendDlgItemMessage(hWndDlg,IDC_NAME,CB_GETCURSEL,0,0))

 				{

-					HCONTACT hContact = SendSMSWindowSMSContactGet(hWndDlg,(SendDlgItemMessage(hWndDlg,IDC_NAME,CB_GETCURSEL,0,0)-1));

+					MCONTACT hContact = SendSMSWindowSMSContactGet(hWndDlg,(SendDlgItemMessage(hWndDlg,IDC_NAME,CB_GETCURSEL,0,0)-1));

 					if (hContact) AddContactPhonesToCombo(hWndDlg,hContact);

 				}

 			}

@@ -557,7 +557,7 @@ INT_PTR CALLBACK SMSAcceptedDlgProc(HWND hWndDlg,UINT msg,WPARAM wParam,LPARAM l
 

 //This function create a new SMS send window, and insert it to the list.

 //The function gets void and return the window HWND

-HWND SendSMSWindowAdd(HCONTACT hContact)

+HWND SendSMSWindowAdd(MCONTACT hContact)

 {

 	HWND hRet=NULL;

 	SEND_SMS_WINDOW_DATA *psswdWindowData=(SEND_SMS_WINDOW_DATA*)MEMALLOC(sizeof(SEND_SMS_WINDOW_DATA));

@@ -608,9 +608,9 @@ void SendSMSWindowRemove(HWND hWndDlg)
 

 //This function return the contact HANDLE for the given to the SMS send window.

 //The function gets the HWND of the window and return the HANDLE of the contact.

-HCONTACT SendSMSWindowHContactGet(HWND hWndDlg)

+MCONTACT SendSMSWindowHContactGet(HWND hWndDlg)

 {

-	HCONTACT hRet=NULL;

+	MCONTACT hRet=NULL;

 	SEND_SMS_WINDOW_DATA *psswdWindowData=GET_WINDOW_DATA(hWndDlg);

 

 	if (psswdWindowData) hRet=psswdWindowData->hMyContact;

@@ -619,7 +619,7 @@ HCONTACT SendSMSWindowHContactGet(HWND hWndDlg)
 

 //This function set the contact info of the person we send him the in the given to the SMS send window.

 //The function gets the HWND of the window and the HANDLE of the contact and return void

-void SendSMSWindowHContactSet(HWND hWndDlg,HCONTACT hContact)

+void SendSMSWindowHContactSet(HWND hWndDlg,MCONTACT hContact)

 {

 	SEND_SMS_WINDOW_DATA *psswdWindowData=GET_WINDOW_DATA(hWndDlg);

 	if (psswdWindowData) psswdWindowData->hMyContact=hContact;

@@ -837,7 +837,7 @@ return(NULL);
 //This function get the HANDLE of an user. if there is already a SMS send window for this contact

 //it return its HWND else the function return NULL.

 //The function gets the HANDLE of a contact and return HWND

-HWND SendSMSWindowIsOtherInstanceHContact(HCONTACT hContact)

+HWND SendSMSWindowIsOtherInstanceHContact(MCONTACT hContact)

 {

 	HWND hRet=NULL;

 	SEND_SMS_WINDOW_DATA *psswdWindowData;

@@ -893,23 +893,23 @@ void SendSMSWindowNext(HWND hWndDlg)
 //////////////////////////////////////////////////////////////////////////////////////////

 //////////////////////////////////////////////////////////////////////////////////////////

 //This function gets a HANDLE of a contact and add it to a list.

-void SendSMSWindowSMSContactAdd(HWND hWndDlg,HCONTACT hContact)

+void SendSMSWindowSMSContactAdd(HWND hWndDlg,MCONTACT hContact)

 {

 	SEND_SMS_WINDOW_DATA *psswdWindowData=GET_WINDOW_DATA(hWndDlg);

 

 	if (psswdWindowData) {

 		psswdWindowData->dwContactsListCount++;

 		if (psswdWindowData->phContactsList)

-			psswdWindowData->phContactsList = (HCONTACT*)MEMREALLOC(psswdWindowData->phContactsList,(sizeof(HANDLE)*psswdWindowData->dwContactsListCount));

+			psswdWindowData->phContactsList = (MCONTACT*)MEMREALLOC(psswdWindowData->phContactsList,(sizeof(HANDLE)*psswdWindowData->dwContactsListCount));

 		else

-			psswdWindowData->phContactsList = (HCONTACT*)MEMALLOC((sizeof(HANDLE)*psswdWindowData->dwContactsListCount));

+			psswdWindowData->phContactsList = (MCONTACT*)MEMALLOC((sizeof(HANDLE)*psswdWindowData->dwContactsListCount));

 

 		*(psswdWindowData->phContactsList+psswdWindowData->dwContactsListCount-1)=hContact;

 	}

 }

 

 //This function gets the number of the given contact in the combo list and return its contact.

-HCONTACT SendSMSWindowSMSContactGet(HWND hWndDlg,SIZE_T iNum)

+MCONTACT SendSMSWindowSMSContactGet(HWND hWndDlg,SIZE_T iNum)

 {

 	SEND_SMS_WINDOW_DATA *psswdWindowData=GET_WINDOW_DATA(hWndDlg);

 

@@ -974,7 +974,7 @@ void SendSMSWindowsUpdateAllAccountLists()
 

 

 

-void AddContactPhonesToComboToListParam(HCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,HWND hWndList)

+void AddContactPhonesToComboToListParam(MCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,HWND hWndList)

 {

 	char szBuff[MAX_PATH];

 	TCHAR tszPhone[MAX_PHONE_LEN],tszPhoneRaw[MAX_PHONE_LEN];

@@ -1008,7 +1008,7 @@ void AddContactPhonesToComboToListParam(HCONTACT hContact,LPSTR lpszModule,LPSTR
 }

 

 

-void AddContactPhonesToCombo(HWND hWnd,HCONTACT hContact)

+void AddContactPhonesToCombo(HWND hWnd,MCONTACT hContact)

 {

 	HWND hWndList = GetDlgItem(hWnd,IDC_ADDRESS);

 	SendDlgItemMessage(hWnd,IDC_ADDRESS,CB_RESETCONTENT,0,0);

@@ -1029,7 +1029,7 @@ void AddContactPhonesToCombo(HWND hWnd,HCONTACT hContact)
 

 

 

-void AddContactPhonesToTreeViewParam(HCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,HWND hWndList,HTREEITEM *phParent)

+void AddContactPhonesToTreeViewParam(MCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,HWND hWndList,HTREEITEM *phParent)

 {

 	char szBuff[MAX_PATH];

 	TCHAR tszPhone[MAX_PHONE_LEN],tszPhoneRaw[MAX_PHONE_LEN];

@@ -1087,7 +1087,7 @@ void SendSMSWindowFillTreeView(HWND hWnd)
 	HWND hWndTreeView=GetDlgItem(hWnd,IDC_NUMBERSLIST);

 	TreeView_DeleteAllItems(hWndTreeView);

 

-	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 		HTREEITEM hParent = NULL;

 		LPSTR lpszProto = GetContactProto(hContact);

 		if (lpszProto) {

diff --git a/plugins/SMS/src/senddlg.h b/plugins/SMS/src/senddlg.h
index 81c7acf2dc..9276ef9c62 100644
--- a/plugins/SMS/src/senddlg.h
+++ b/plugins/SMS/src/senddlg.h
@@ -11,10 +11,10 @@ INT_PTR CALLBACK	SMSTimedOutDlgProc(HWND hWndDlg,UINT msg,WPARAM wParam,LPARAM l
 HTREEITEM SendSMSWindowHItemSendGet(HWND hWndDlg);

 HTREEITEM SendSMSWindowNextHItemGet(HWND hWndDlg,HTREEITEM hItem);

 

-HWND     SendSMSWindowAdd(HCONTACT hContact);

+HWND     SendSMSWindowAdd(MCONTACT hContact);

 void     SendSMSWindowRemove(HWND hWndDlg);

-HCONTACT SendSMSWindowHContactGet(HWND hWndDlg);

-void     SendSMSWindowHContactSet(HWND hWndDlg,HCONTACT hContact);

+MCONTACT SendSMSWindowHContactGet(HWND hWndDlg);

+void     SendSMSWindowHContactSet(HWND hWndDlg,MCONTACT hContact);

 HWND     SendSMSWindowHwndByHProcessGet(HANDLE hProcess);

 void     SendSMSWindowHProcessSet(HWND hWndDlg,HANDLE hProcess);

 BOOL     SendSMSWindowMultipleGet(HWND hWndDlg);

@@ -24,11 +24,11 @@ void     SendSMSWindowAsSentSet(HWND hWndDlg);
 void     SendSMSWindowDbeiSet(HWND hWndDlg,DBEVENTINFO *pdbei);

 void     SendSMSWindowDBAdd(HWND hWndDlg);

 void     SendSMSWindowHItemSendSet(HWND hWndDlg,HTREEITEM hItemSend);

-HWND     SendSMSWindowIsOtherInstanceHContact(HCONTACT hContact);

+HWND     SendSMSWindowIsOtherInstanceHContact(MCONTACT hContact);

 void     SendSMSWindowNext(HWND hWndDlg);

 

-void     SendSMSWindowSMSContactAdd(HWND hWndDlg,HCONTACT hContact);

-HCONTACT SendSMSWindowSMSContactGet(HWND hWndDlg,SIZE_T iNum);

+void     SendSMSWindowSMSContactAdd(HWND hWndDlg,MCONTACT hContact);

+MCONTACT SendSMSWindowSMSContactGet(HWND hWndDlg,SIZE_T iNum);

 void     SendSMSWindowSMSContactsRemove(HWND hWndDlg);

 void     SendSMSWindowUpdateAccountList(HWND hWndDlg);

 void     SendSMSWindowsUpdateAllAccountLists();