From bd8a04455d9c991c15df2287e091abe4ba054efb Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 25 Nov 2012 12:54:45 +0000
Subject: typed stub for MS_PROTO_GETCONTACTBASEPROTO

git-svn-id: http://svn.miranda-ng.org/main/trunk@2480 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Variables/src/contact.cpp            | 23 +++++++++--------------
 plugins/Variables/src/parse_metacontacts.cpp |  6 +++---
 plugins/Variables/src/parse_miranda.cpp      |  2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)

(limited to 'plugins/Variables/src')

diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp
index 1e525d8d5c..bfe4da507e 100644
--- a/plugins/Variables/src/contact.cpp
+++ b/plugins/Variables/src/contact.cpp
@@ -118,7 +118,7 @@ TCHAR* getContactInfoT(BYTE type, HANDLE hContact)
 	if (hContact == NULL)
 		return NULL;
 
-	szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	szProto = GetContactProto(hContact);
 	if (szProto == NULL)
 		return NULL;
 
@@ -241,17 +241,12 @@ int getContactFromString( CONTACTSINFO* ci )
 	if (ci == NULL)
 		return -1;
 
-	if (ci->flags&CI_UNICODE) {
-		
-			tszContact = NEWTSTR_ALLOCA(ci->tszContact);
-	
-	}
+	if (ci->flags & CI_UNICODE)
+		tszContact = NEWTSTR_ALLOCA(ci->tszContact);
 	else {
-	
-			WCHAR* tmp = mir_a2t(ci->szContact);
-			tszContact = NEWTSTR_ALLOCA(tmp);
-			mir_free(tmp);
-		
+		WCHAR* tmp = mir_a2t(ci->szContact);
+		tszContact = NEWTSTR_ALLOCA(tmp);
+		mir_free(tmp);
 	}
 	if ((tszContact == NULL) || (_tcslen(tszContact) == 0))
 		return -1;
@@ -281,7 +276,7 @@ int getContactFromString( CONTACTSINFO* ci )
 		szFind = NULL;
 		bMatch = FALSE;
 		ZeroMemory(&dbv, sizeof(DBVARIANT));
-		szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+		szProto = GetContactProto(hContact);
 		if (szProto == NULL) {
 			hContact = db_find_next(hContact);
 			continue;
@@ -443,7 +438,7 @@ static int contactSettingChanged(WPARAM wParam, LPARAM lParam)
 			continue;
 
 		dbw = (DBCONTACTWRITESETTING*)lParam;
-		szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam,0);
+		szProto = GetContactProto((HANDLE)wParam);
 		if (szProto == NULL)
 			continue;
 
@@ -505,7 +500,7 @@ TCHAR *encodeContactToString(HANDLE hContact)
 	DBVARIANT dbv;
 
 	ZeroMemory(&dbv, sizeof(DBVARIANT));
-	szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	szProto = GetContactProto(hContact);
 	tszUniqueId = getContactInfoT(CNF_UNIQUEID, hContact);
 	if (szProto == NULL || tszUniqueId == NULL)
 		return NULL;
diff --git a/plugins/Variables/src/parse_metacontacts.cpp b/plugins/Variables/src/parse_metacontacts.cpp
index 8831e7a192..9bf44fb4c3 100644
--- a/plugins/Variables/src/parse_metacontacts.cpp
+++ b/plugins/Variables/src/parse_metacontacts.cpp
@@ -51,7 +51,7 @@ static TCHAR *parseGetParent(ARGUMENTSINFO *ai)
 
 	TCHAR* res = NULL;
 	TCHAR* szUniqueID = NULL;
-	char* szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	char* szProto = GetContactProto(hContact);
 	if (szProto != NULL)
 		szUniqueID = getContactInfoT(CNF_UNIQUEID, hContact);
 
@@ -112,7 +112,7 @@ static TCHAR *parseGetDefault(ARGUMENTSINFO *ai)
 
 	TCHAR* res = NULL;
 	TCHAR* szUniqueID = NULL;
-	char* szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	char* szProto = GetContactProto(hContact);
 	if (szProto != NULL)
 		szUniqueID = getContactInfoT(CNF_UNIQUEID, hContact);
 
@@ -172,7 +172,7 @@ static TCHAR *parseGetMostOnline(ARGUMENTSINFO *ai)
 
 	TCHAR* res = NULL;
 	TCHAR* szUniqueID = NULL;
-	char* szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	char* szProto = GetContactProto(hContact);
 	if (szProto != NULL)
 		szUniqueID = getContactInfoT(CNF_UNIQUEID, hContact);
 
diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp
index f5492eea77..178fe6eb68 100644
--- a/plugins/Variables/src/parse_miranda.cpp
+++ b/plugins/Variables/src/parse_miranda.cpp
@@ -476,7 +476,7 @@ static TCHAR *parseSpecialContact(ARGUMENTSINFO *ai)
 	ai->flags |= AIF_DONTPARSE;
 	TCHAR *res = NULL;
 	TCHAR *szUniqueID = NULL;
-	char *szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ai->fi->hContact, 0);
+	char *szProto = GetContactProto(ai->fi->hContact);
 	if (szProto != NULL)
 		szUniqueID = getContactInfoT(CNF_UNIQUEID, ai->fi->hContact);
 
-- 
cgit v1.2.3