typed stub for MS_PROTO_GETCONTACTBASEPROTO

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

5 files changed, 11 insertions, 11 deletions

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index d3b359e49f..4c6b1faa59 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -1405,7 +1405,7 @@ void GGPROTO::setalloffline()
 	HANDLE hContact = db_find_first();

 	while (hContact)

 	{

-		char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

+		char *szProto = GetContactProto(hContact);

 		if (szProto != NULL && !strcmp(szProto, m_szModuleName))

 		{

 			db_set_w(hContact, m_szModuleName, GG_KEY_STATUS, ID_STATUS_OFFLINE);

@@ -1478,7 +1478,7 @@ void GGPROTO::notifyall()
 	hContact = db_find_first();

 	while (hContact)

 	{

-		szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

+		szProto = GetContactProto(hContact);

 		if (szProto != NULL && !strcmp(szProto, m_szModuleName)) count ++;

 		hContact = db_find_next(hContact);

 	}

@@ -1501,7 +1501,7 @@ void GGPROTO::notifyall()
 	hContact = db_find_first();

 	while (hContact && cc < count)

 	{

-		szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

+		szProto = GetContactProto(hContact);

 		if (szProto != NULL && !strcmp(szProto, m_szModuleName) && (uins[cc] = db_get_dw(hContact, m_szModuleName, GG_KEY_UIN, 0)))

 		{

 			if ((db_get_w(hContact, m_szModuleName, GG_KEY_APPARENT, (WORD) ID_STATUS_ONLINE) == ID_STATUS_OFFLINE) ||

@@ -1540,7 +1540,7 @@ HANDLE GGPROTO::getcontact(uin_t uin, int create, int inlist, TCHAR *szNick)
 	// Look for contact in DB

 	HANDLE hContact = db_find_first();

 	while (hContact) {

-		char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

+		char *szProto = GetContactProto(hContact);

 		if (szProto != NULL && !strcmp(szProto, m_szModuleName)) {

 			if ((uin_t)db_get_dw(hContact, m_szModuleName, GG_KEY_UIN, 0) == uin

 				&& db_get_b(hContact, m_szModuleName, "ChatRoom", 0) == 0)

diff --git a/protocols/Gadu-Gadu/src/dialogs.cpp b/protocols/Gadu-Gadu/src/dialogs.cpp
index d34b8e54d1..440e0718e4 100644
--- a/protocols/Gadu-Gadu/src/dialogs.cpp
+++ b/protocols/Gadu-Gadu/src/dialogs.cpp
@@ -746,7 +746,7 @@ static INT_PTR CALLBACK gg_detailsdlgproc(HWND hwndDlg, UINT msg, WPARAM wParam,
 					if (hContact == NULL)

 						szProto = gg->m_szModuleName;

 					else

-						szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

+						szProto = GetContactProto(hContact);

 					if (szProto == NULL)

 						break;

 

@@ -880,7 +880,7 @@ static INT_PTR CALLBACK gg_detailsdlgproc(HWND hwndDlg, UINT msg, WPARAM wParam,
 

 int GGPROTO::details_init(WPARAM wParam, LPARAM lParam)

 {

-	char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, lParam, 0);

+	char* szProto = GetContactProto((HANDLE)lParam);

 	if ((szProto == NULL || strcmp(szProto, m_szModuleName)) && lParam || lParam && db_get_b((HANDLE)lParam, m_szModuleName, "ChatRoom", 0))

 			return 0;

 

diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index eafcb952fa..c6c5b9715a 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -211,7 +211,7 @@ static int gg_preshutdown(WPARAM wParam, LPARAM lParam)
 // Gets protocol instance associated with a contact

 static GGPROTO* gg_getprotoinstance(HANDLE hContact)

 {

-	char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

+	char* szProto = GetContactProto(hContact);

 	list_t l = g_Instances;

 

 	if (szProto == NULL)

diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp
index 0117ce8805..118a674439 100644
--- a/protocols/Gadu-Gadu/src/groupchat.cpp
+++ b/protocols/Gadu-Gadu/src/groupchat.cpp
@@ -399,7 +399,7 @@ char* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_count)
 

 static HANDLE gg_getsubcontact(GGPROTO* gg, HANDLE hContact)

 {

-	char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

+	char* szProto = GetContactProto(hContact);

 	char* szMetaProto = (char*)CallService(MS_MC_GETPROTOCOLNAME, 0, 0);

 

 	if (szProto && szMetaProto && (INT_PTR)szMetaProto != CALLSERVICE_NOTFOUND && !lstrcmpA(szProto, szMetaProto))

@@ -409,7 +409,7 @@ static HANDLE gg_getsubcontact(GGPROTO* gg, HANDLE hContact)
 		for (i = 0; i < nSubContacts; i++)

 		{

 			hMetaContact = (HANDLE)CallService(MS_MC_GETSUBCONTACT, (WPARAM)hContact, i);

-			szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hMetaContact, 0);

+			szProto = GetContactProto(hMetaContact);

 			if (szProto && !lstrcmpA(szProto, gg->m_szModuleName))

 				return hMetaContact;

 		}

@@ -557,7 +557,7 @@ static INT_PTR CALLBACK gg_gc_openconfdlg(HWND hwndDlg, UINT message, WPARAM wPa
 									}

 									else

 									{

-										szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

+										szProto = GetContactProto(hContact);

 										uin = (uin_t)db_get_dw(hContact, gg->m_szModuleName, GG_KEY_UIN, 0);

 									}

 

diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp
index 3ccc95c7fe..1bb5725222 100644
--- a/protocols/Gadu-Gadu/src/import.cpp
+++ b/protocols/Gadu-Gadu/src/import.cpp
@@ -104,7 +104,7 @@ char *gg_makecontacts(GGPROTO *gg, int cr)
 	HANDLE hContact = db_find_first();

 	while (hContact)

 	{

-		char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

+		char *szProto = GetContactProto(hContact);

 		if (szProto != NULL && !strcmp(szProto, gg->m_szModuleName) && !db_get_b(hContact, gg->m_szModuleName, "ChatRoom", 0))

 		{

 			DBVARIANT dbv;