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, 20 deletions

diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index 0f413368fe..585575f77b 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -155,7 +155,7 @@ static bool CheckContactsServiceSupport(const char* szProto)
 static int HookPreBuildContactMenu(WPARAM wParam, LPARAM lParam)

 {

   HANDLE hContact = (HANDLE)wParam;

-  char* szProto = GetContactProto(hContact);

+  char* szProto =GetContactProto(hContact);

   int bVisible = FALSE;

 

   if (szProto && CheckContactsServiceSupport(szProto))

@@ -214,7 +214,7 @@ static int HookModulesLoaded(WPARAM wParam, LPARAM lParam)
 static int HookContactSettingChanged(WPARAM wParam, LPARAM lParam)

 {

   DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

-  char *szProto = GetContactProto((HANDLE)wParam);

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

 

   if (strcmpnull(cws->szModule,"CList") && strcmpnull(cws->szModule, szProto)) return 0;

 

diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp
index 3d3fb2f773..d590a3b37b 100644
--- a/plugins/ContactsPlus/src/receive.cpp
+++ b/plugins/ContactsPlus/src/receive.cpp
@@ -137,7 +137,7 @@ static void RebuildGroupCombo(HWND hwndDlg)
 static HANDLE CreateTemporaryContactForItem(HWND hwndDlg, TRecvContactsData* wndData, int iItem)

 {

   char* caUIN = ListView_GetItemTextEx(GetDlgItem(hwndDlg, IDC_CONTACTS), iItem, 0);

-  char* szProto = GetContactProto(wndData->mhContact);

+  char* szProto =GetContactProto(wndData->mhContact);

   wndData->rhSearch = (HANDLE)CallProtoService(szProto, PS_BASICSEARCH, 0, (LPARAM)caUIN); // find it

   SAFE_FREE((void**)&wndData->haUin);

   wndData->haUin = caUIN;

@@ -193,7 +193,7 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
       TranslateMenu(wndData->mhPopup);

       wndData->hHook = HookEventMessage(ME_PROTO_ACK, hwndDlg, HM_EVENTSENT);

 

-      char *szProto = GetContactProto(wndData->mhContact);

+      char *szProto =GetContactProto(wndData->mhContact);

 

       HWND hLV = GetDlgItem(hwndDlg, IDC_CONTACTS);

       ListView_SetExtendedListViewStyle(hLV, LVS_EX_CHECKBOXES|LVS_EX_FULLROWSELECT);

@@ -332,7 +332,7 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
               for (int j = 0; j < wndData->cbReceived; j++)   // determine item index in packet

                 if (!strcmpnull(wndData->maReceived[j]->mcaUIN, caUIN))

                 {

-                  char* szProto = GetContactProto(wndData->mhContact);

+                  char* szProto =GetContactProto(wndData->mhContact);

                   HANDLE hContact = (HANDLE)CallProtoService(szProto, PS_ADDTOLISTBYEVENT, MAKEWPARAM(0, j), (LPARAM)wndData->mhDbEvent);

                   if (hContact && caGroup)

                   { // use newest group API if available

diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp
index ac042fa63e..c09284a2eb 100644
--- a/plugins/ContactsPlus/src/send.cpp
+++ b/plugins/ContactsPlus/src/send.cpp
@@ -139,7 +139,7 @@ int TSendContactsData::SendContactsPacket(HWND hwndDlg, HANDLE *phContacts, int
 

 

 int TSendContactsData::SendContacts(HWND hwndDlg) {

-  char* szProto = GetContactProto(hContact);

+  char* szProto =GetContactProto(hContact);

   int nMaxContacts = CallProtoService(szProto, PS_GETCAPS, PFLAG_MAXCONTACTSPERPACKET, (LPARAM)hContact);

 

   if (!nMaxContacts) {

@@ -224,7 +224,7 @@ static void SetAllContactChecks(HWND hwndList, HANDLE hReceiver) // doubtful nam
 

   if (binListEvent) return;

   binListEvent = TRUE;

-  char* szProto = GetContactProto(hReceiver); 

+  char* szProto =GetContactProto(hReceiver); 

   if (szProto == NULL) return;

 

   if (CallService(MS_CLUI_GETCAPS, 0, 0) & CLUIF_HIDEEMPTYGROUPS && DBGetContactSettingByte(NULL, "CList", "HideEmptyGroups", SETTING_USEGROUPS_DEFAULT))

@@ -235,7 +235,7 @@ static void SetAllContactChecks(HWND hwndList, HANDLE hReceiver) // doubtful nam
   hContact = FindFirstClistContact(hwndList, &hItem);

   while (hContact)

   {

-    char* szProto2 = GetContactProto(hContact);

+    char* szProto2 =GetContactProto(hContact);

 

     if (strcmpnull(szProto, szProto2))

     { // different protocols or protocol undefined, remove contact, useless anyway

@@ -470,7 +470,7 @@ INT_PTR CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
       }

 

       dbei.cbSize = sizeof(dbei);

-      dbei.szModule = GetContactProto(ackData->hContact);

+      dbei.szModule =GetContactProto(ackData->hContact);

       dbei.eventType = EVENTTYPE_CONTACTS;

       dbei.flags = DBEF_SENT;

       if (g_UnicodeCore && g_Utf8EventsSupported)

diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp
index f0971a37ae..18b80b9d3f 100644
--- a/plugins/ContactsPlus/src/utils.cpp
+++ b/plugins/ContactsPlus/src/utils.cpp
@@ -61,19 +61,11 @@ void __fastcall SAFE_FREE(void** p)
   }

 }

 

-

-char *GetContactProto(HANDLE hContact)

-{

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

-}

-

-

 TCHAR *GetContactDisplayNameT(HANDLE hContact)

 {

   return (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, g_UnicodeCore ? GCDNF_UNICODE : 0);

 }

 

-

 char *GetContactUID(HANDLE hContact, int bTchar)

 {

   DBVARIANT vrUid;

@@ -218,7 +210,7 @@ void UpdateDialogTitle(HWND hwndDlg, HANDLE hContact, char* pszTitleStart)
 

   if (hContact)

   {

-    szProto = GetContactProto(hContact);

+    szProto =GetContactProto(hContact);

     if (szProto)

     {

       TCHAR *uid = GetContactUID(hContact, TRUE);

@@ -273,7 +265,7 @@ HICON InitMButton(HWND hDlg, int idButton, LPCSTR szIcon, char* szTip)
 

 HICON LoadContactProtoIcon(HANDLE hContact)

 {

-  char* szProto = GetContactProto(hContact);

+  char* szProto =GetContactProto(hContact);

   if (szProto)

     return (HICON)CallProtoService(szProto, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0);

   return NULL;

diff --git a/plugins/ContactsPlus/src/utils.h b/plugins/ContactsPlus/src/utils.h
index 3bc2d8e00d..c9d89e9f24 100644
--- a/plugins/ContactsPlus/src/utils.h
+++ b/plugins/ContactsPlus/src/utils.h
@@ -33,7 +33,6 @@ size_t __fastcall strlennull(const char *string);
 int __fastcall strcmpnull(const char *str1, const char *str2);

 char* __fastcall null_strdup(const char *string);

 

-char *GetContactProto(HANDLE hContact);

 char *GetContactUID(HANDLE hContact, int bTchar);

 TCHAR *GetContactDisplayNameT(HANDLE hContact);

 TCHAR* MirandaStatusToStringT(int mirandaStatus);