- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

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

8 files changed, 82 insertions, 85 deletions

diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp
index 7e5d31be65..549d959a92 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((HANDLE)wParam));

+	Menu_ShowItem(ssSMSSettings.hContactMenuItems[0], GetContactPhonesCount((HCONTACT)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((HANDLE)wParam);

+		hwndSendSms = SendSMSWindowIsOtherInstanceHContact((HCONTACT)wParam);

 		if (hwndSendSms)

 			SetFocus(hwndSendSms);

 		else

-			hwndSendSms = SendSMSWindowAdd((HANDLE)wParam);

+			hwndSendSms = SendSMSWindowAdd((HCONTACT)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 (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+		for (HCONTACT 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 (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

+	for (HCONTACT 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 5388d6dda6..ae468ebcc6 100644
--- a/plugins/SMS/src/common.h
+++ b/plugins/SMS/src/common.h
@@ -92,26 +92,26 @@ 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(HANDLE hContact,LPSTR lpszModule,LPSTR lpszValueName,LPWSTR lpszRetBuff,SIZE_T dwRetBuffSize,SIZE_T *pdwRetBuffSize);

+BOOL	DB_GetStaticStringW(HCONTACT 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(HANDLE hContact);

+LPSTR  GetModuleName(HCONTACT 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(HANDLE hContact);

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

+DWORD  GetContactPhonesCount(HCONTACT hContact);

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

 

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

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

+HCONTACT 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.

 BOOL   GetXMLFieldEx(LPSTR lpszXML,SIZE_T dwXMLSize,LPSTR *plpszData,SIZE_T *pdwDataSize,const char *tag1,...);

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

 

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

+BOOL DB_GetStaticStringW(HCONTACT 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(HANDLE hContact,LPSTR lpszModule,LPSTR lpszValueName,LP
 	return(bRet);

 }

 

-LPSTR GetModuleName(HANDLE hContact)

+LPSTR GetModuleName(HCONTACT hContact)

 {

 	LPSTR lpszRet;

 

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

 

 

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

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

 {

 	DWORD dwRet=0;

 	char szBuff[MAX_PATH];

@@ -113,7 +113,7 @@ DWORD GetContactPhonesCountParam(HANDLE hContact,LPSTR lpszModule,LPSTR lpszValu
 }

 

 

-DWORD GetContactPhonesCount(HANDLE hContact)

+DWORD GetContactPhonesCount(HCONTACT hContact)

 {

 	DWORD dwRet = 0;

 	LPSTR lpszProto = GetContactProto(hContact);

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

 

 

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

+BOOL IsContactPhoneParam(HCONTACT 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(HANDLE hContact,LPSTR lpszModule,LPSTR lpszValueName,LP
 }

 

 

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

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

 {

 	BOOL bRet=FALSE;

 	WCHAR wszPhoneLocal[MAX_PHONE_LEN];

@@ -181,11 +181,11 @@ BOOL IsContactPhone(HANDLE 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.

-HANDLE HContactFromPhone(LPWSTR lpwszPhone,SIZE_T dwPhoneSize)

+HCONTACT HContactFromPhone(LPWSTR lpwszPhone,SIZE_T dwPhoneSize)

 {

 	if (lpwszPhone && dwPhoneSize) {

 		//check not already on list

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

+		for (HCONTACT 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 43cab8af13..e6f647adc6 100644
--- a/plugins/SMS/src/receive.cpp
+++ b/plugins/SMS/src/receive.cpp
@@ -45,7 +45,6 @@ int handleAckSMS(WPARAM wParam,LPARAM lParam)
 			{

 				LPSTR lpszMessageUTF;

 				SIZE_T dwBuffLen,dwMessageXMLEncodedSize,dwMessageXMLDecodedSize;

-				HANDLE hContact;

 				DBEVENTINFO dbei = { sizeof(dbei) };

 

 				dwBuffLen=(dwDataSize+MAX_PATH);

@@ -61,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=HContactFromPhone(tszPhone,dwPhoneSize);

+					HCONTACT hContact=HContactFromPhone(tszPhone,dwPhoneSize);

 

 					dbei.szModule=GetModuleName(hContact);

 					dbei.timestamp=time(NULL);

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

-				HANDLE hContact=HContactFromPhone(tszPhone,dwPhoneSize);

+				HCONTACT hContact=HContactFromPhone(tszPhone,dwPhoneSize);

 

 				DBEVENTINFO dbei={0};

 				dbei.cbSize=sizeof(dbei);

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

 	char szServiceFunction[MAX_PATH], *pszServiceFunctionName;

 	TCHAR szToolTip[MAX_PATH];

-	HANDLE hContact = (HANDLE)wParam, hDbEvent = (HANDLE)lParam;

+	HCONTACT hContact = (HCONTACT)wParam;

+	HANDLE hDbEvent = (HANDLE)lParam;

 

 	DBEVENTINFO dbei = { sizeof(dbei) };

 	if ((dbei.cbBlob = db_event_getBlobSize(hDbEvent)) != -1) {

diff --git a/plugins/SMS/src/recvdlg.cpp b/plugins/SMS/src/recvdlg.cpp
index e7f640ffca..eea5b7ca60 100644
--- a/plugins/SMS/src/recvdlg.cpp
+++ b/plugins/SMS/src/recvdlg.cpp
@@ -30,10 +30,10 @@ Enjoy the code and use it smartly!
 //Defnition needed to the SMS window list

 typedef struct

 {

-	LIST_MT_ITEM	lmtListMTItem;

-	HWND			hWnd;

-	HBRUSH			hBkgBrush;

-	HANDLE			hContact;

+	LIST_MT_ITEM lmtListMTItem;

+	HWND hWnd;

+	HBRUSH hBkgBrush;

+	HCONTACT 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;

-				HANDLE hContact;

+				HCONTACT 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(HANDLE hContact,DWORD dwEventType,LPWSTR lpwszPhone,SIZE_T dwPhoneSize,LPSTR lpszMessage,SIZE_T dwMessageSize)

+HWND RecvSMSWindowAdd(HCONTACT 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 5090dff12e..47363466fe 100644
--- a/plugins/SMS/src/recvdlg.h
+++ b/plugins/SMS/src/recvdlg.h
@@ -3,7 +3,7 @@
 

 DWORD	RecvSMSWindowInitialize		();

 void	RecvSMSWindowDestroy		();

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

+HWND	RecvSMSWindowAdd			(HCONTACT 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 e92fdbe2ce..e8c32565e7 100644
--- a/plugins/SMS/src/senddlg.cpp
+++ b/plugins/SMS/src/senddlg.cpp
@@ -36,20 +36,20 @@ Enjoy the code and use it smartly!
 //Defnition needed to the SMS window list

 typedef struct

 {

-	LIST_MT_ITEM	lmtListMTItem;

-	HWND			hWnd;

-	HBRUSH			hBkgBrush;

-	HANDLE			hProcess;

-	HANDLE			hContact;

-	HANDLE			hMyContact;

-	HTREEITEM		hItemSend;

-	BOOL			bMultiple;

-	SIZE_T			dwContactsListCount;

-	HANDLE			*phContactsList;

-	DBEVENTINFO		*pdbei;

+	LIST_MT_ITEM lmtListMTItem;

+	HWND hWnd;

+	HBRUSH hBkgBrush;

+	HANDLE hProcess;

+	HCONTACT hContact;

+	HCONTACT hMyContact;

+	HTREEITEM hItemSend;

+	BOOL bMultiple;

+	SIZE_T dwContactsListCount;

+	HCONTACT *phContactsList;

+	DBEVENTINFO *pdbei;

 } SEND_SMS_WINDOW_DATA;

 

-void			AddContactPhonesToCombo		(HWND hWnd,HANDLE hContact);

+void			AddContactPhonesToCombo		(HWND hWnd,HCONTACT 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))

 				{

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

+					HCONTACT 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(HANDLE hContact)

+HWND SendSMSWindowAdd(HCONTACT hContact)

 {

 	HWND hRet=NULL;

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

@@ -608,18 +608,18 @@ 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.

-HANDLE SendSMSWindowHContactGet(HWND hWndDlg)

+HCONTACT SendSMSWindowHContactGet(HWND hWndDlg)

 {

-	HANDLE hRet=NULL;

+	HCONTACT hRet=NULL;

 	SEND_SMS_WINDOW_DATA *psswdWindowData=GET_WINDOW_DATA(hWndDlg);

 

 	if (psswdWindowData) hRet=psswdWindowData->hMyContact;

-return(hRet);

+	return(hRet);

 }

 

 //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,HANDLE hContact)

+void SendSMSWindowHContactSet(HWND hWndDlg,HCONTACT 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(HANDLE hContact)

+HWND SendSMSWindowIsOtherInstanceHContact(HCONTACT hContact)

 {

 	HWND hRet=NULL;

 	SEND_SMS_WINDOW_DATA *psswdWindowData;

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

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

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

-void SendSMSWindowSMSContactAdd(HWND hWndDlg,HANDLE hContact)

+void SendSMSWindowSMSContactAdd(HWND hWndDlg,HCONTACT hContact)

 {

 	SEND_SMS_WINDOW_DATA *psswdWindowData=GET_WINDOW_DATA(hWndDlg);

 

-	if (psswdWindowData)

-	{

+	if (psswdWindowData) {

 		psswdWindowData->dwContactsListCount++;

 		if (psswdWindowData->phContactsList)

-		{

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

-		}else{

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

-		}

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

+		else

+			psswdWindowData->phContactsList = (HCONTACT*)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.

-HANDLE SendSMSWindowSMSContactGet(HWND hWndDlg,SIZE_T iNum)

+HCONTACT SendSMSWindowSMSContactGet(HWND hWndDlg,SIZE_T iNum)

 {

 	SEND_SMS_WINDOW_DATA *psswdWindowData=GET_WINDOW_DATA(hWndDlg);

 

 	if (psswdWindowData)

-	{

 		return(*((psswdWindowData->phContactsList)+iNum));

-	}

-return(NULL);

+

+	return(NULL);

 }

 

 void SendSMSWindowSMSContactsRemove(HWND hWndDlg)

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

 

 

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

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

 {

 	char szBuff[MAX_PATH];

 	TCHAR tszPhone[MAX_PHONE_LEN],tszPhoneRaw[MAX_PHONE_LEN];

@@ -1011,7 +1008,7 @@ void AddContactPhonesToComboToListParam(HANDLE hContact,LPSTR lpszModule,LPSTR l
 }

 

 

-void AddContactPhonesToCombo(HWND hWnd,HANDLE hContact)

+void AddContactPhonesToCombo(HWND hWnd,HCONTACT hContact)

 {

 	HWND hWndList = GetDlgItem(hWnd,IDC_ADDRESS);

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

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

 

 

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

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

 {

 	char szBuff[MAX_PATH];

 	TCHAR tszPhone[MAX_PHONE_LEN],tszPhoneRaw[MAX_PHONE_LEN];

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

 	TreeView_DeleteAllItems(hWndTreeView);

 

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

+	for (HCONTACT 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 e3ad1d40b5..81c7acf2dc 100644
--- a/plugins/SMS/src/senddlg.h
+++ b/plugins/SMS/src/senddlg.h
@@ -11,26 +11,26 @@ INT_PTR CALLBACK	SMSTimedOutDlgProc(HWND hWndDlg,UINT msg,WPARAM wParam,LPARAM l
 HTREEITEM SendSMSWindowHItemSendGet(HWND hWndDlg);

 HTREEITEM SendSMSWindowNextHItemGet(HWND hWndDlg,HTREEITEM hItem);

 

-HWND   SendSMSWindowAdd(HANDLE hContact);

-void   SendSMSWindowRemove(HWND hWndDlg);

-HANDLE SendSMSWindowHContactGet(HWND hWndDlg);

-void   SendSMSWindowHContactSet(HWND hWndDlg,HANDLE hContact);

-HWND   SendSMSWindowHwndByHProcessGet(HANDLE hProcess);

-void   SendSMSWindowHProcessSet(HWND hWndDlg,HANDLE hProcess);

-BOOL   SendSMSWindowMultipleGet(HWND hWndDlg);

-void   SendSMSWindowMultipleSet(HWND hWndDlg,BOOL bMultiple);

-void   SendSMSWindowNumberSet(HWND hWndDlg,LPWSTR lpwszPhone,SIZE_T dwPhoneSize);

-void   SendSMSWindowAsSentSet(HWND hWndDlg);

-void   SendSMSWindowDbeiSet(HWND hWndDlg,DBEVENTINFO *pdbei);

-void   SendSMSWindowDBAdd(HWND hWndDlg);

-void   SendSMSWindowHItemSendSet(HWND hWndDlg,HTREEITEM hItemSend);

-HWND   SendSMSWindowIsOtherInstanceHContact(HANDLE hContact);

-void   SendSMSWindowNext(HWND hWndDlg);

+HWND     SendSMSWindowAdd(HCONTACT hContact);

+void     SendSMSWindowRemove(HWND hWndDlg);

+HCONTACT SendSMSWindowHContactGet(HWND hWndDlg);

+void     SendSMSWindowHContactSet(HWND hWndDlg,HCONTACT hContact);

+HWND     SendSMSWindowHwndByHProcessGet(HANDLE hProcess);

+void     SendSMSWindowHProcessSet(HWND hWndDlg,HANDLE hProcess);

+BOOL     SendSMSWindowMultipleGet(HWND hWndDlg);

+void     SendSMSWindowMultipleSet(HWND hWndDlg,BOOL bMultiple);

+void     SendSMSWindowNumberSet(HWND hWndDlg,LPWSTR lpwszPhone,SIZE_T dwPhoneSize);

+void     SendSMSWindowAsSentSet(HWND hWndDlg);

+void     SendSMSWindowDbeiSet(HWND hWndDlg,DBEVENTINFO *pdbei);

+void     SendSMSWindowDBAdd(HWND hWndDlg);

+void     SendSMSWindowHItemSendSet(HWND hWndDlg,HTREEITEM hItemSend);

+HWND     SendSMSWindowIsOtherInstanceHContact(HCONTACT hContact);

+void     SendSMSWindowNext(HWND hWndDlg);

 

-void   SendSMSWindowSMSContactAdd(HWND hWndDlg,HANDLE hContact);

-HANDLE SendSMSWindowSMSContactGet(HWND hWndDlg,SIZE_T iNum);

-void   SendSMSWindowSMSContactsRemove(HWND hWndDlg);

-void   SendSMSWindowUpdateAccountList(HWND hWndDlg);

-void   SendSMSWindowsUpdateAllAccountLists();

+void     SendSMSWindowSMSContactAdd(HWND hWndDlg,HCONTACT hContact);

+HCONTACT SendSMSWindowSMSContactGet(HWND hWndDlg,SIZE_T iNum);

+void     SendSMSWindowSMSContactsRemove(HWND hWndDlg);

+void     SendSMSWindowUpdateAccountList(HWND hWndDlg);

+void     SendSMSWindowsUpdateAllAccountLists();

 

 #endif // !defined(AFX_SMS_SENDDLG_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_)