From bd8a04455d9c991c15df2287e091abe4ba054efb Mon Sep 17 00:00:00 2001 From: George Hazan 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 --- src/core/stdauth/auth.cpp | 2 +- src/core/stdaway/awaymsg.cpp | 4 ++-- src/core/stdchat/src/clist.cpp | 12 ++++++------ src/core/stdemail/email.cpp | 4 ++-- src/core/stdfile/file.cpp | 6 +++--- src/core/stdfile/filerecvdlg.cpp | 15 ++++++--------- src/core/stdfile/filesenddlg.cpp | 6 ++---- src/core/stdfile/filexferdlg.cpp | 6 +++--- src/core/stdmsg/src/msgdialog.cpp | 6 +++--- src/core/stdmsg/src/msgs.cpp | 10 +++++----- src/core/stdmsg/src/msgtimedout.cpp | 9 ++------- src/core/stdurl/url.cpp | 4 ++-- src/core/stdurl/urldialogs.cpp | 8 ++++---- src/core/stduserinfo/contactinfo.cpp | 2 +- src/core/stduserinfo/stdinfo.cpp | 14 +++++++------- src/core/stduserinfo/userinfo.cpp | 2 +- src/modules/addcontact/addcontact.cpp | 2 +- src/modules/clist/clc.cpp | 10 +++++----- src/modules/clist/clcfiledrop.cpp | 2 +- src/modules/clist/clcitems.cpp | 6 +++--- src/modules/clist/clistevents.cpp | 16 ++++++++-------- src/modules/clist/clistmenus.cpp | 2 +- src/modules/clist/clistmod.cpp | 8 ++++---- src/modules/clist/clistsettings.cpp | 4 ++-- src/modules/clist/clui.cpp | 2 +- src/modules/clist/contact.cpp | 6 +++--- src/modules/extraicons/DefaultExtraIcons.cpp | 12 ++++++------ src/modules/ignore/ignore.cpp | 2 +- src/modules/protocols/protocols.cpp | 6 +++--- src/modules/utils/path.cpp | 4 ++-- src/modules/utils/timezones.cpp | 2 +- src/modules/visibility/visibility.cpp | 2 +- 32 files changed, 93 insertions(+), 103 deletions(-) (limited to 'src') diff --git a/src/core/stdauth/auth.cpp b/src/core/stdauth/auth.cpp index e124c10bbf..07cb8f4b94 100644 --- a/src/core/stdauth/auth.cpp +++ b/src/core/stdauth/auth.cpp @@ -69,7 +69,7 @@ static int AuthEventAdded(WPARAM, LPARAM lParam) CONTACTINFO ci = {0}; ci.cbSize = sizeof(ci); ci.hContact = hContact; - ci.szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + ci.szProto = GetContactProto(hContact); ci.dwFlag = CNF_UNIQUEID | CNF_TCHAR; if ( !CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM)&ci)) { switch (ci.type) { diff --git a/src/core/stdaway/awaymsg.cpp b/src/core/stdaway/awaymsg.cpp index 8b18198830..4419e34b53 100644 --- a/src/core/stdaway/awaymsg.cpp +++ b/src/core/stdaway/awaymsg.cpp @@ -53,7 +53,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP { TCHAR str[256], format[128]; TCHAR *contactName = pcli->pfnGetContactDisplayName(dat->hContact, 0); - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0); + char *szProto = GetContactProto(dat->hContact); WORD dwStatus = DBGetContactSettingWord(dat->hContact, szProto, "Status", ID_STATUS_OFFLINE); TCHAR *status = pcli->pfnGetStatusModeDescription(dwStatus, 0); @@ -136,7 +136,7 @@ static int AwayMsgPreBuildMenu(WPARAM wParam, LPARAM) TCHAR str[128]; char *szProto; - szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + szProto = GetContactProto((HANDLE)wParam); ZeroMemory(&clmi, sizeof(clmi)); clmi.cbSize = sizeof(clmi); clmi.flags = CMIM_FLAGS | CMIF_NOTOFFLINE | CMIF_HIDDEN | CMIF_TCHAR; diff --git a/src/core/stdchat/src/clist.cpp b/src/core/stdchat/src/clist.cpp index e3f3e2ed61..83467c0c71 100644 --- a/src/core/stdchat/src/clist.cpp +++ b/src/core/stdchat/src/clist.cpp @@ -89,7 +89,7 @@ END_GROUPLOOP: BOOL CList_SetOffline(HANDLE hContact, BOOL bHide) { if ( hContact ) { - char* szProto = ( char* )CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char* szProto = GetContactProto(hContact); int i = DBGetContactSettingByte(hContact, szProto, "ChatRoom", 0); DBWriteContactSettingWord(hContact, szProto,"ApparentMode",(LPARAM) 0); DBWriteContactSettingWord(hContact, szProto, "Status", ID_STATUS_OFFLINE); @@ -106,7 +106,7 @@ BOOL CList_SetAllOffline(BOOL bHide, const char *pszModule) hContact = db_find_first(); while ( hContact ) { - szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + szProto = GetContactProto(hContact); if ( MM_FindModule( szProto )) { if ( !pszModule || ( pszModule && !strcmp( pszModule, szProto ))) { int i = DBGetContactSettingByte(hContact, szProto, "ChatRoom", 0); @@ -129,7 +129,7 @@ int CList_RoomDoubleclicked( WPARAM wParam, LPARAM lParam ) if ( !hContact ) return 0; - szProto = ( char* )CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + szProto = GetContactProto(hContact); if ( MM_FindModule(szProto)) { if ( DBGetContactSettingByte( hContact, szProto, "ChatRoom", 0 ) == 0 ) return 0; @@ -169,7 +169,7 @@ INT_PTR CList_JoinChat(WPARAM wParam, LPARAM lParam) { HANDLE hContact = (HANDLE)wParam; if ( hContact ) { - char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char* szProto = GetContactProto(hContact); if ( szProto ) { if ( DBGetContactSettingWord( hContact, szProto, "Status", 0 ) == ID_STATUS_OFFLINE ) CallProtoService( szProto, PS_JOINCHAT, wParam, lParam ); @@ -184,7 +184,7 @@ INT_PTR CList_LeaveChat(WPARAM wParam, LPARAM lParam) { HANDLE hContact = (HANDLE)wParam; if ( hContact ) { - char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char* szProto = GetContactProto(hContact); if ( szProto ) CallProtoService( szProto, PS_LEAVECHAT, wParam, lParam ); } @@ -195,7 +195,7 @@ int CList_PrebuildContactMenu(WPARAM wParam, LPARAM lParam) { HANDLE hContact = (HANDLE)wParam; if ( hContact ) { - char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char* szProto = GetContactProto(hContact); CLISTMENUITEM clmi = {0}; clmi.cbSize = sizeof(CLISTMENUITEM); diff --git a/src/core/stdemail/email.cpp b/src/core/stdemail/email.cpp index 23694dbddb..b18743d809 100644 --- a/src/core/stdemail/email.cpp +++ b/src/core/stdemail/email.cpp @@ -34,7 +34,7 @@ void SendEmailThread(void *szUrl) static INT_PTR SendEMailCommand(WPARAM wParam, LPARAM lParam) { DBVARIANT dbv; - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if (szProto == NULL || DBGetContactSettingString((HANDLE)wParam, szProto, "e-mail", &dbv)) { if (DBGetContactSettingString((HANDLE)wParam, "UserInfo", "Mye-mail0", &dbv)) { MessageBox((HWND)lParam, TranslateT("User has not registered an e-mail address"), TranslateT("Send e-mail"), MB_OK); @@ -56,7 +56,7 @@ static int EMailPreBuildMenu(WPARAM wParam, LPARAM) mi.flags = CMIM_FLAGS; DBVARIANT dbv = { 0 }; - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if (szProto == NULL || DBGetContactSettingString((HANDLE)wParam, szProto, "e-mail", & dbv)) if (DBGetContactSettingString((HANDLE)wParam, "UserInfo", "Mye-mail0", &dbv)) mi.flags = CMIM_FLAGS | CMIF_HIDDEN; diff --git a/src/core/stdfile/file.cpp b/src/core/stdfile/file.cpp index 5fa7d5ae22..dfb77b086b 100644 --- a/src/core/stdfile/file.cpp +++ b/src/core/stdfile/file.cpp @@ -32,7 +32,7 @@ static HANDLE hSRFileMenuItem; TCHAR *GetContactID(HANDLE hContact) { TCHAR *theValue = {0}; - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char *szProto = GetContactProto(hContact); if (DBGetContactSettingByte(hContact, szProto, "ChatRoom", 0) == 1) { DBVARIANT dbv; if ( !DBGetContactSettingTString(hContact, szProto, "ChatRoomID", &dbv)) { @@ -312,7 +312,7 @@ static int SRFilePreBuildMenu(WPARAM wParam, LPARAM) mi.cbSize = sizeof(mi); mi.flags = CMIM_FLAGS | CMIF_HIDDEN; - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if (szProto != NULL) { if ( CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_FILESEND) { if ( CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_OFFLINEFILES) @@ -396,7 +396,7 @@ static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam) DBEVENTINFO dbei = { 0 }; dbei.cbSize = sizeof(dbei); - dbei.szModule = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0); + dbei.szModule = GetContactProto(ccs->hContact); dbei.timestamp = pre->timestamp; dbei.flags = (pre->flags & PREF_CREATEREAD) ? DBEF_READ : 0; dbei.eventType = EVENTTYPE_FILE; diff --git a/src/core/stdfile/filerecvdlg.cpp b/src/core/stdfile/filerecvdlg.cpp index 6b4ce2e743..6492530004 100644 --- a/src/core/stdfile/filerecvdlg.cpp +++ b/src/core/stdfile/filerecvdlg.cpp @@ -154,7 +154,7 @@ void GetContactReceivedFilesDir(HANDLE hContact, TCHAR *szDir, int cchDir, BOOL rvaVarsToReplace[1].lptzKey = _T("userid"); rvaVarsToReplace[1].lptzValue = GetContactID(hContact); rvaVarsToReplace[2].lptzKey = _T("proto"); - rvaVarsToReplace[2].lptzValue = mir_a2t((char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0)); + rvaVarsToReplace[2].lptzValue = mir_a2t(GetContactProto(hContact)); rvaVarsToReplace[3].lptzKey = NULL; rvaVarsToReplace[3].lptzValue = NULL; for (int i=0; i < (SIZEOF(rvaVarsToReplace)-1);i++) @@ -274,7 +274,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l tmi.printTimeStamp(NULL, dbei.timestamp, _T("t d"), datetimestr, SIZEOF(datetimestr), 0); SetDlgItemText(hwndDlg, IDC_DATE, datetimestr); - char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0); + char* szProto = GetContactProto(dat->hContact); if (szProto) { int hasName = 0; char buf[128]; @@ -322,15 +322,12 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam); case WM_DRAWITEM: - { LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam; + { + LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam; if (dis->hwndItem == GetDlgItem(hwndDlg, IDC_PROTOCOL)) { - char *szProto; - - szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0); + char *szProto = GetContactProto(dat->hContact); if (szProto) { - HICON hIcon; - - hIcon = (HICON)CallProtoService(szProto, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0); + HICON hIcon = (HICON)CallProtoService(szProto, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0); if (hIcon) { DrawIconEx(dis->hDC, dis->rcItem.left, dis->rcItem.top, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, NULL, DI_NORMAL); DestroyIcon(hIcon); diff --git a/src/core/stdfile/filesenddlg.cpp b/src/core/stdfile/filesenddlg.cpp index 642e2fd950..5c1419c683 100644 --- a/src/core/stdfile/filesenddlg.cpp +++ b/src/core/stdfile/filesenddlg.cpp @@ -231,7 +231,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l TCHAR *contactName = pcli->pfnGetContactDisplayName(dat->hContact, 0); SetDlgItemText(hwndDlg, IDC_TO, contactName); - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0); + char *szProto = GetContactProto(dat->hContact); if (szProto) { CONTACTINFO ci; int hasName = 0; @@ -276,9 +276,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l { LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam; if (dis->hwndItem == GetDlgItem(hwndDlg, IDC_PROTOCOL)) { - char *szProto; - - szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0); + char *szProto = GetContactProto(dat->hContact); if (szProto) { HICON hIcon = (HICON)CallProtoService(szProto, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0); if (hIcon) { diff --git a/src/core/stdfile/filexferdlg.cpp b/src/core/stdfile/filexferdlg.cpp index 306c0cd457..474c49f7df 100644 --- a/src/core/stdfile/filexferdlg.cpp +++ b/src/core/stdfile/filexferdlg.cpp @@ -78,7 +78,7 @@ static void SetOpenFileButtonStyle(HWND hwndButton, int enabled) void FillSendData(FileDlgData* dat, DBEVENTINFO& dbei) { dbei.cbSize = sizeof(dbei); - dbei.szModule = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0); + dbei.szModule = GetContactProto(dat->hContact); dbei.eventType = EVENTTYPE_FILE; dbei.flags = DBEF_SENT; dbei.timestamp = time(NULL); @@ -282,7 +282,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR dat->hIcon = NULL; SendDlgItemMessage(hwndDlg, IDC_CONTACT, BM_SETIMAGE, IMAGE_ICON, - (LPARAM)LoadSkinnedProtoIcon((char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0), ID_STATUS_ONLINE)); + (LPARAM)LoadSkinnedProtoIcon(GetContactProto(dat->hContact), ID_STATUS_ONLINE)); SendDlgItemMessage(hwndDlg, IDC_CONTACT, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Contact menu"), 0); SendDlgItemMessage(hwndDlg, IDC_CONTACT, BUTTONSETASFLATBTN, TRUE, 0); @@ -469,7 +469,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR case M_FILEEXISTSDLGREPLY: { PROTOFILERESUME *pfr = (PROTOFILERESUME*)lParam; TCHAR *szOriginalFilename = (TCHAR*)wParam; - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0); + char *szProto = GetContactProto(dat->hContact); EnableWindow(hwndDlg, TRUE); switch(pfr->action) { diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index dcd20353bf..22bd5b46e8 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -60,7 +60,7 @@ static void NotifyLocalWinEvent(HANDLE hContact, HWND hwnd, unsigned int type) static char *MsgServiceName(HANDLE hContact) { char szServiceName[100]; - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *szProto = GetContactProto(hContact); if (szProto == NULL) return PSS_MESSAGE; @@ -72,7 +72,7 @@ static char *MsgServiceName(HANDLE hContact) static BOOL IsUtfSendAvailable(HANDLE hContact) { - char* szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char* szProto = GetContactProto(hContact); if ( szProto == NULL ) return FALSE; @@ -719,7 +719,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP PostMessage(GetDlgItem(hwndDlg, IDC_MESSAGE), EM_SETSEL, len, len); } - dat->szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) dat->hContact, 0); + dat->szProto = GetContactProto(dat->hContact); RichUtil_SubClass(GetDlgItem(hwndDlg, IDC_LOG)); RichUtil_SubClass(GetDlgItem(hwndDlg, IDC_MESSAGE)); diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 940487b011..6167c53214 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -83,7 +83,7 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam) /* new message */ SkinPlaySound("AlertMsg"); { - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if (szProto && (g_dat->openFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) { struct NewMessageWindowLParam newData = { 0 }; @@ -116,7 +116,7 @@ INT_PTR SendMessageCmd(HANDLE hContact, char* msg, int isWchar) HWND hwnd; /* does the HCONTACT's protocol support IM messages? */ - szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + szProto = GetContactProto(hContact); if (!szProto || (!CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND)) return 1; @@ -225,7 +225,7 @@ static int MessageSettingChanged(WPARAM wParam, LPARAM lParam) WindowList_Broadcast(g_dat->hMessageWindowList, DM_NEWTIMEZONE, (WPARAM) cws, 0); else { - char * szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char * szProto = GetContactProto((HANDLE)wParam); if (szProto && !strcmp(cws->szModule, szProto)) WindowList_Broadcast(g_dat->hMessageWindowList, DM_UPDATETITLE, (WPARAM) cws, 0); } @@ -273,7 +273,7 @@ static void RestoreUnreadMessageAlerts(void) if (windowAlreadyExists) continue; { - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *szProto = GetContactProto(hContact); if (szProto && (g_dat->openFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) { autoPopup = 1; @@ -374,7 +374,7 @@ static int PrebuildContactMenu(WPARAM wParam, LPARAM lParam) { HANDLE hContact = (HANDLE)wParam; if ( hContact ) { - char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char* szProto = GetContactProto(hContact); CLISTMENUITEM clmi = {0}; clmi.cbSize = sizeof(CLISTMENUITEM); diff --git a/src/core/stdmsg/src/msgtimedout.cpp b/src/core/stdmsg/src/msgtimedout.cpp index 1b1773aa8e..b956faaf2a 100644 --- a/src/core/stdmsg/src/msgtimedout.cpp +++ b/src/core/stdmsg/src/msgtimedout.cpp @@ -70,14 +70,9 @@ INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar break; case WM_COMMAND: - switch (LOWORD(wParam)) - { + switch (LOWORD(wParam)) { case IDOK: - { - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) item->hContact, 0); - SendMessageDirect(item->szMsg, item->hContact, szProto); - } - + SendMessageDirect(item->szMsg, item->hContact, GetContactProto(item->hContact)); DestroyWindow(hwndDlg); break; diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp index f1751d74c1..767828dc3c 100644 --- a/src/core/stdurl/url.cpp +++ b/src/core/stdurl/url.cpp @@ -105,7 +105,7 @@ static void RestoreUnreadUrlAlerts(void) static int ContactSettingChanged(WPARAM wParam, LPARAM lParam) { DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if (lstrcmpA(cws->szModule, "CList") && (szProto == NULL || lstrcmpA(cws->szModule, szProto))) return 0; @@ -119,7 +119,7 @@ static int SRUrlPreBuildMenu(WPARAM wParam, LPARAM) mi.cbSize = sizeof(mi); mi.flags = CMIM_FLAGS | CMIF_HIDDEN; - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if (szProto != NULL) if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_URLSEND) mi.flags = CMIM_FLAGS; diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp index b0b8fa00b2..a13b969647 100644 --- a/src/core/stdurl/urldialogs.cpp +++ b/src/core/stdurl/urldialogs.cpp @@ -34,7 +34,7 @@ static void sttUpdateTitle(HWND hwndDlg, HANDLE hContact) char *szProto; if (hContact) { - szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + szProto = GetContactProto(hContact); if (szProto) { CONTACTINFO ci; int hasName = 0; @@ -141,7 +141,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if (dis->hwndItem == GetDlgItem(hwndDlg, IDC_PROTOCOL)) { char *szProto; - szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0); + szProto = GetContactProto(dat->hContact); if (szProto) { HICON hIcon; @@ -522,7 +522,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP { LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam; if (dis->hwndItem == GetDlgItem(hwndDlg, IDC_PROTOCOL)) { - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0); + char *szProto = GetContactProto(dat->hContact); if (szProto) { HICON hIcon = (HICON)CallProtoService(szProto, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0); if (hIcon) { @@ -630,7 +630,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dbei.cbSize = sizeof(dbei); dbei.eventType = EVENTTYPE_URL; dbei.flags = DBEF_SENT; - dbei.szModule = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0); + dbei.szModule = GetContactProto(dat->hContact); dbei.timestamp = time(NULL); dbei.cbBlob = (DWORD)(strlen(dat->sendBuffer)+strlen(dat->sendBuffer+strlen(dat->sendBuffer)+1)+2); dbei.pBlob = (PBYTE)dat->sendBuffer; diff --git a/src/core/stduserinfo/contactinfo.cpp b/src/core/stduserinfo/contactinfo.cpp index 71152950f1..82a40ad899 100644 --- a/src/core/stduserinfo/contactinfo.cpp +++ b/src/core/stduserinfo/contactinfo.cpp @@ -253,7 +253,7 @@ INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP { HANDLE hContact = (HANDLE)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); if (hContact != NULL) { - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char *szProto = GetContactProto(hContact); if (szProto == NULL) break; diff --git a/src/core/stduserinfo/stdinfo.cpp b/src/core/stduserinfo/stdinfo.cpp index d717b7f68e..986e2d4057 100644 --- a/src/core/stduserinfo/stdinfo.cpp +++ b/src/core/stduserinfo/stdinfo.cpp @@ -67,7 +67,7 @@ static void SetValue(HWND hwndDlg, int idCtrl, HANDLE hContact, char *szModule, { char str[80], *pstr = NULL; TCHAR* ptstr = NULL; - char* szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char* szProto = GetContactProto(hContact); bool proto_service = szProto && (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_INFOSETTINGSVC); DBVARIANT dbv = { DBVT_DELETED }; @@ -195,7 +195,7 @@ static INT_PTR CALLBACK SummaryDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP if (((LPNMHDR)lParam)->code == PSN_INFOCHANGED) { HANDLE hContact = (HANDLE)((LPPSHNOTIFY)lParam)->lParam; if (hContact != NULL) { - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char *szProto = GetContactProto(hContact); if (szProto == NULL) break; @@ -270,7 +270,7 @@ static INT_PTR CALLBACK LocationDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L if (((LPNMHDR)lParam)->code == PSN_INFOCHANGED) { HANDLE hContact = (HANDLE)((LPPSHNOTIFY)lParam)->lParam; if (hContact != NULL) { - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char *szProto = GetContactProto(hContact); if (szProto == NULL) break; @@ -320,7 +320,7 @@ static INT_PTR CALLBACK WorkDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if (((LPNMHDR)lParam)->code == PSN_INFOCHANGED) { HANDLE hContact = (HANDLE)((LPPSHNOTIFY)lParam)->lParam; if (hContact != NULL) { - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char *szProto = GetContactProto(hContact); if (szProto == NULL) break; SetValue(hwndDlg, IDC_COMPANY, hContact, szProto, "Company", SVS_ZEROISUNSPEC); SetValue(hwndDlg, IDC_DEPARTMENT, hContact, szProto, "CompanyDepartment", SVS_ZEROISUNSPEC); @@ -397,7 +397,7 @@ static INT_PTR CALLBACK BackgroundDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, HANDLE hContact = (HANDLE)((LPPSHNOTIFY)lParam)->lParam; if (hContact != NULL) { - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char *szProto = GetContactProto(hContact); if (szProto == NULL) break; bool proto_service = (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_INFOSETTINGSVC) == PF4_INFOSETTINGSVC; SetValue(hwndDlg, IDC_WEBPAGE, hContact, szProto, "Homepage", SVS_ZEROISUNSPEC); @@ -536,7 +536,7 @@ static INT_PTR CALLBACK NotesDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR { char *szProto; HANDLE hContact = (HANDLE)((LPPSHNOTIFY)lParam)->lParam; if (hContact != NULL) { - szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + szProto = GetContactProto(hContact); if (szProto == NULL) break; SetValue(hwndDlg, IDC_ABOUT, hContact, szProto, "About", 0); } @@ -577,7 +577,7 @@ int DetailsInit(WPARAM wParam, LPARAM lParam) if (lParam == NULL) return 0; - if (CallService(MS_PROTO_GETCONTACTBASEPROTO, lParam, 0) == 0) + if (GetContactProto((HANDLE)lParam) == 0) return 0; OPTIONSDIALOGPAGE odp; diff --git a/src/core/stduserinfo/userinfo.cpp b/src/core/stduserinfo/userinfo.cpp index 37b7168137..c8b435e4ed 100644 --- a/src/core/stduserinfo/userinfo.cpp +++ b/src/core/stduserinfo/userinfo.cpp @@ -412,7 +412,7 @@ static INT_PTR CALLBACK DlgProcDetails(HWND hwndDlg, UINT msg, WPARAM wParam, LP case M_CHECKONLINE: if (dat->hContact != NULL) { - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0); + char *szProto = GetContactProto(dat->hContact); if (szProto == NULL) EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATE), FALSE); else { diff --git a/src/modules/addcontact/addcontact.cpp b/src/modules/addcontact/addcontact.cpp index 60ef8cca0d..5516611297 100644 --- a/src/modules/addcontact/addcontact.cpp +++ b/src/modules/addcontact/addcontact.cpp @@ -86,7 +86,7 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp if (acs->handleType == HANDLE_CONTACT && acs->handle) if (acs->szProto == NULL || (acs->szProto != NULL && *acs->szProto == 0)) - acs->szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)acs->handle, 0); + acs->szProto = GetContactProto(acs->handle); { int groupId; diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp index 81e0fe8ce3..d05ee95686 100644 --- a/src/modules/clist/clc.cpp +++ b/src/modules/clist/clc.cpp @@ -93,7 +93,7 @@ static int ClcSettingChanged(WPARAM wParam, LPARAM lParam) cli.pfnClcBroadcast(INTM_NAMEORDERCHANGED, 0, 0); } else { - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if (szProto != NULL) { if ( !strcmp(cws->szModule, "Protocol") && !strcmp(cws->szSetting, "p")) cli.pfnClcBroadcast(INTM_PROTOCHANGED, wParam, lParam); @@ -511,7 +511,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, HANDLE hSelItem = NULL; ClcContact *selcontact = NULL; - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if (szProto == NULL) status = ID_STATUS_OFFLINE; else @@ -580,7 +580,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, if ( !cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) break; - contact->proto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + contact->proto = GetContactProto((HANDLE)wParam); cli.pfnInvalidateDisplayNameCacheEntry((HANDLE)wParam); lstrcpyn(contact->szText, cli.pfnGetContactDisplayName((HANDLE)wParam, 0), SIZEOF(contact->szText)); SortClcByTimer(hwnd); @@ -606,7 +606,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, case INTM_APPARENTMODECHANGED: if ( cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) { - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if (szProto == NULL) break; @@ -628,7 +628,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, case INTM_IDLECHANGED: if ( cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) { - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if (szProto == NULL) break; contact->flags &= ~CONTACTF_IDLE; diff --git a/src/modules/clist/clcfiledrop.cpp b/src/modules/clist/clcfiledrop.cpp index 1993936a01..c33bc23334 100644 --- a/src/modules/clist/clcfiledrop.cpp +++ b/src/modules/clist/clcfiledrop.cpp @@ -76,7 +76,7 @@ static HANDLE HContactFromPoint(HWND hwnd, struct ClcData *dat, int x, int y, in if (hit == -1 || !(hitFlags & (CLCHT_ONITEMLABEL | CLCHT_ONITEMICON)) || contact->type != CLCIT_CONTACT) return NULL; - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) contact->hContact, 0); + char *szProto = GetContactProto(contact->hContact); if (szProto == NULL) return NULL; diff --git a/src/modules/clist/clcitems.cpp b/src/modules/clist/clcitems.cpp index e9d280b96f..4619ba6c4b 100644 --- a/src/modules/clist/clcitems.cpp +++ b/src/modules/clist/clcitems.cpp @@ -184,7 +184,7 @@ int fnAddContactToGroup(struct ClcData *dat, ClcGroup *group, HANDLE hContact) } i = cli.pfnAddItemToGroup(group, index + 1); - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *szProto = GetContactProto(hContact); group->cl.items[i]->type = CLCIT_CONTACT; group->cl.items[i]->iImage = CallService(MS_CLIST_GETCONTACTICON, (WPARAM) hContact, 0); group->cl.items[i]->hContact = hContact; @@ -218,7 +218,7 @@ void fnAddContactToTree(HWND hwnd, struct ClcData *dat, HANDLE hContact, int upd DBVARIANT dbv; DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE); WORD status = ID_STATUS_OFFLINE; - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *szProto = GetContactProto(hContact); dat->needsResort = 1; if (style & CLS_NOHIDEOFFLINE) @@ -392,7 +392,7 @@ void fnRebuildEntireList(HWND hwnd, struct ClcData *dat) if (_tcsstr(lowered_name, lowered_search)) cli.pfnAddContactToGroup(dat, group, hContact); } else if ( !(style & CLS_NOHIDEOFFLINE) && (style & CLS_HIDEOFFLINE || group->hideOffline)) { - szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + szProto = GetContactProto(hContact); if (szProto == NULL) { if ( !cli.pfnIsHiddenMode(dat, ID_STATUS_OFFLINE)) cli.pfnAddContactToGroup(dat, group, hContact); diff --git a/src/modules/clist/clistevents.cpp b/src/modules/clist/clistevents.cpp index 71a520b2ff..253381b4a9 100644 --- a/src/modules/clist/clistevents.cpp +++ b/src/modules/clist/clistevents.cpp @@ -73,7 +73,7 @@ static char * GetEventProtocol(int idx) szProto = NULL; } else - szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) cli.events.items[idx]->cle.hContact, 0); + szProto = GetContactProto(cli.events.items[idx]->cle.hContact); return szProto; } return NULL; @@ -185,8 +185,8 @@ struct CListEvent* fnAddEvent(CLISTEVENT *cle) else szProto = NULL; } - else - szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)cle->hContact, 0); + else szProto = GetContactProto(cle->hContact); + iconsOn = 1; flashTimerId = SetTimer(NULL, 0, db_get_w(NULL, "CList", "IconFlashTime", 550), IconFlashTimer); cli.pfnTrayIconUpdateWithImageList(p->imlIconIndex, p->cle.ptszTooltip, szProto); @@ -214,7 +214,7 @@ int fnRemoveEvent(HANDLE hContact, HANDLE dbEvent) return 1; // Update contact's icon - szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + szProto = GetContactProto(hContact); cli.pfnChangeContactIcon(cli.events.items[i]->cle.hContact, CallService(MS_CLIST_GETCONTACTICON, (WPARAM)cli.events.items[i]->cle.hContact, 1), 0); @@ -228,7 +228,7 @@ int fnRemoveEvent(HANDLE hContact, HANDLE dbEvent) for (i=0; i < cli.events.count; i++) { if (cli.events.items[i]->cle.hContact) - szEventProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)(cli.events.items[i]->cle.hContact), 0); + szEventProto = GetContactProto((cli.events.items[i]->cle.hContact)); else if (cli.events.items[i]->cle.flags&CLEF_PROTOCOLGLOBAL) szEventProto = (char *) cli.events.items[i]->cle.lpszProtocol; else @@ -248,7 +248,7 @@ int fnRemoveEvent(HANDLE hContact, HANDLE dbEvent) if (cli.events.items[0]->cle.hContact == NULL) szProto = NULL; else - szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) cli.events.items[0]->cle.hContact, 0); + szProto = GetContactProto(cli.events.items[0]->cle.hContact); cli.pfnTrayIconUpdateWithImageList(iconsOn ? cli.events.items[0]->imlIconIndex : 0, cli.events.items[0]->cle.ptszTooltip, szProto); } @@ -304,7 +304,7 @@ int fnEventsProcessTrayDoubleClick(int index) for (i=0; icle.hContact) - eventProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)cli.events.items[i]->cle.hContact, 0); + eventProto = GetContactProto(cli.events.items[i]->cle.hContact); if ( !eventProto) eventProto = cli.events.items[i]->cle.lpszProtocol; @@ -321,7 +321,7 @@ int fnEventsProcessTrayDoubleClick(int index) for (i=0; icle.hContact) - eventProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)cli.events.items[i]->cle.hContact, 0); + eventProto = GetContactProto(cli.events.items[i]->cle.hContact); if ( !eventProto) eventProto = cli.events.items[i]->cle.lpszProtocol; if (eventProto) { diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp index ce37c3ad59..e88ca7aa46 100644 --- a/src/modules/clist/clistmenus.cpp +++ b/src/modules/clist/clistmenus.cpp @@ -331,7 +331,7 @@ static INT_PTR BuildContactMenu(WPARAM wParam, LPARAM) HANDLE hContact = (HANDLE)wParam; NotifyEventHooks(hPreBuildContactMenuEvent, (WPARAM)hContact, 0); - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char *szProto = GetContactProto(hContact); BuildContactParam bcp; bcp.szProto = szProto; diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp index fdbc75fe82..3c7f6ddc49 100644 --- a/src/modules/clist/clistmod.cpp +++ b/src/modules/clist/clistmod.cpp @@ -148,7 +148,7 @@ static int ProtocolAck(WPARAM, LPARAM lParam) if (caps & PF1_SERVERCLIST) { 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, ack->szModule)) if (db_get_b(hContact, "CList", "Delete", 0)) CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0); @@ -187,7 +187,7 @@ int fnIconFromStatusMode(const char *szProto, int status, HANDLE) static INT_PTR GetContactIcon(WPARAM wParam, LPARAM) { - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); HANDLE hContact = (HANDLE)wParam; return cli.pfnIconFromStatusMode(szProto, @@ -444,8 +444,8 @@ static INT_PTR CompareContacts(WPARAM wParam, LPARAM lParam) char *szProto1, *szProto2; int rc; - szProto1 = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) a, 0); - szProto2 = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) b, 0); + szProto1 = GetContactProto(a); + szProto2 = GetContactProto(b); statusa = db_get_w((HANDLE) a, SAFESTRING(szProto1), "Status", ID_STATUS_OFFLINE); statusb = db_get_w((HANDLE) b, SAFESTRING(szProto2), "Status", ID_STATUS_OFFLINE); diff --git a/src/modules/clist/clistsettings.cpp b/src/modules/clist/clistsettings.cpp index 504511acd2..b3d1edb897 100644 --- a/src/modules/clist/clistsettings.cpp +++ b/src/modules/clist/clistsettings.cpp @@ -214,7 +214,7 @@ INT_PTR InvalidateDisplayName(WPARAM wParam, LPARAM) int ContactAdded(WPARAM wParam, LPARAM) { - cli.pfnChangeContactIcon((HANDLE)wParam, cli.pfnIconFromStatusMode((char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0), ID_STATUS_OFFLINE, NULL), 1); + cli.pfnChangeContactIcon((HANDLE)wParam, cli.pfnIconFromStatusMode(GetContactProto((HANDLE)wParam), ID_STATUS_OFFLINE, NULL), 1); cli.pfnSortContacts(); return 0; } @@ -269,7 +269,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam) if ( !strcmp(cws->szModule, "CList")) { if ( !strcmp(cws->szSetting, "Hidden")) { if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0) { - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode(szProto, szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), hContact), 1); } else diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp index 58f3978b84..612be5cd8e 100644 --- a/src/modules/clist/clui.cpp +++ b/src/modules/clist/clui.cpp @@ -192,7 +192,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam) // Delete contact case IDYES: { - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if (szProto != NULL) { // Check if protocol uses server side lists DWORD caps; diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp index 76cb8960c7..9ecc273604 100644 --- a/src/modules/clist/contact.cpp +++ b/src/modules/clist/contact.cpp @@ -45,7 +45,7 @@ static const struct { static int GetContactStatus(HANDLE hContact) { - char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char* szProto = GetContactProto(hContact); if (szProto == NULL) return ID_STATUS_OFFLINE; return db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE); @@ -83,7 +83,7 @@ void fnLoadContactTree(void) while (hContact != NULL) { status = GetContactStatus(hContact); if (( !hideOffline || status != ID_STATUS_OFFLINE) && !db_get_b(hContact, "CList", "Hidden", 0)) - cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode((char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0), status, hContact), 1); + cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode(GetContactProto(hContact), status, hContact), 1); hContact = db_find_next(hContact); } sortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT); @@ -168,7 +168,7 @@ INT_PTR ContactChangeGroup(WPARAM wParam, LPARAM lParam) db_set_ts((HANDLE)wParam, "CList", "Group", grpChg.pszNewName); } CallService(MS_CLUI_CONTACTADDED, wParam, - cli.pfnIconFromStatusMode((char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0), GetContactStatus((HANDLE)wParam), (HANDLE)wParam)); + cli.pfnIconFromStatusMode(GetContactProto((HANDLE)wParam), GetContactStatus((HANDLE)wParam), (HANDLE)wParam)); NotifyEventHooks(hGroupChangeEvent, wParam, (LPARAM)&grpChg); return 0; diff --git a/src/modules/extraicons/DefaultExtraIcons.cpp b/src/modules/extraicons/DefaultExtraIcons.cpp index 5f848af03f..5e865c7609 100644 --- a/src/modules/extraicons/DefaultExtraIcons.cpp +++ b/src/modules/extraicons/DefaultExtraIcons.cpp @@ -64,7 +64,7 @@ static void SetVisibility(HANDLE hContact, int apparentMode, bool clear) if (hContact == NULL) return; - char *proto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *proto = GetContactProto(hContact); if ( IsEmpty(proto)) return; @@ -101,7 +101,7 @@ static void SetGender(HANDLE hContact, int gender, bool clear) if (hContact == NULL) return; - char *proto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *proto = GetContactProto(hContact); if ( IsEmpty(proto)) return; @@ -172,7 +172,7 @@ static void SetExtraIcons(HANDLE hContact) if (hContact == NULL) return; - char *proto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *proto = GetContactProto(hContact); if ( IsEmpty(proto)) return; @@ -204,7 +204,7 @@ static int SettingChanged(WPARAM wParam, LPARAM lParam) if (hContact == NULL) return 0; - char *proto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *proto = GetContactProto(hContact); if ( IsEmpty(proto)) return 0; @@ -252,7 +252,7 @@ static int DefaultOnClick(WPARAM wParam, LPARAM lParam, LPARAM param) if (hContact == NULL) return 0; - char *proto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *proto = GetContactProto(hContact); if ( IsEmpty(proto)) return 0; @@ -347,7 +347,7 @@ static int ProtocolApplyIcon(WPARAM wParam, LPARAM lParam) { HANDLE hContact = (HANDLE)wParam; - char *proto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *proto = GetContactProto(hContact); if ( IsEmpty(proto)) return 0; diff --git a/src/modules/ignore/ignore.cpp b/src/modules/ignore/ignore.cpp index 6373a32b6c..8b93c9bdf4 100644 --- a/src/modules/ignore/ignore.cpp +++ b/src/modules/ignore/ignore.cpp @@ -172,7 +172,7 @@ static void SetAllContactIcons(HWND hwndList) HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0); if (hItem && SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(IGNOREEVENT_MAX, 0)) == EMPTY_EXTRA_ICON) { DWORD proto1Caps, proto4Caps; - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char *szProto = GetContactProto(hContact); if (szProto) { proto1Caps = CallProtoServiceInt(NULL,szProto, PS_GETCAPS, PFLAGNUM_1, 0); proto4Caps = CallProtoServiceInt(NULL,szProto, PS_GETCAPS, PFLAGNUM_4, 0); diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp index bac663a48f..a39e62899a 100644 --- a/src/modules/protocols/protocols.cpp +++ b/src/modules/protocols/protocols.cpp @@ -166,7 +166,7 @@ static INT_PTR Proto_RecvMessage(WPARAM, LPARAM lParam) DBEVENTINFO dbei = { 0 }; dbei.cbSize = sizeof(dbei); - dbei.szModule = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0); + dbei.szModule = GetContactProto(ccs->hContact); dbei.timestamp = pre->timestamp; dbei.eventType = EVENTTYPE_MESSAGE; if (pre->flags & PREF_UNICODE) { @@ -218,7 +218,7 @@ static int Proto_ValidTypingContact(HANDLE hContact, char *szProto) static INT_PTR Proto_SelfIsTyping(WPARAM wParam, LPARAM lParam) { if (lParam == PROTOTYPE_SELFTYPING_OFF || lParam == PROTOTYPE_SELFTYPING_ON) { - char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char* szProto = GetContactProto((HANDLE)wParam); if ( !szProto) return 0; @@ -232,7 +232,7 @@ static INT_PTR Proto_SelfIsTyping(WPARAM wParam, LPARAM lParam) static INT_PTR Proto_ContactIsTyping(WPARAM wParam, LPARAM lParam) { int type = (int)lParam; - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); if ( !szProto) return 0; diff --git a/src/modules/utils/path.cpp b/src/modules/utils/path.cpp index 24e30fcf4a..184dd876f7 100644 --- a/src/modules/utils/path.cpp +++ b/src/modules/utils/path.cpp @@ -66,7 +66,7 @@ static INT_PTR createDirTreeW(WPARAM, LPARAM lParam) TCHAR *GetContactID(HANDLE hContact) { TCHAR *theValue = {0}; - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char *szProto = GetContactProto(hContact); if (db_get_b(hContact, szProto, "ChatRoom", 0) == 1) { DBVARIANT dbv; if ( !DBGetContactSettingTString(hContact, szProto, "ChatRoomID", &dbv)) { @@ -275,7 +275,7 @@ XCHAR *GetInternalVariable(XCHAR *key, size_t keyLength, HANDLE hContact) if ( !_xcscmp(theKey, XSTR(key, "nick"))) theValue = GetContactNickX(key, hContact); else if ( !_xcscmp(theKey, XSTR(key, "proto"))) - theValue = mir_a2x(key, (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0)); + theValue = mir_a2x(key, GetContactProto(hContact)); else if ( !_xcscmp(theKey, XSTR(key, "userid"))) theValue = GetContactIDX(key, hContact); } diff --git a/src/modules/utils/timezones.cpp b/src/modules/utils/timezones.cpp index a230fa7083..dcdc68b32d 100644 --- a/src/modules/utils/timezones.cpp +++ b/src/modules/utils/timezones.cpp @@ -197,7 +197,7 @@ static HANDLE timeapiGetInfoByContact(HANDLE hContact, DWORD dwFlags) signed char timezone = (signed char)db_get_b(hContact, "UserInfo", "Timezone", -1); if (timezone == -1) { - char* szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char* szProto = GetContactProto(hContact); if ( !DBGetContactSettingTString(hContact, szProto, "TzName", &dbv)) { HANDLE res = timeapiGetInfoByName(dbv.ptszVal, dwFlags); diff --git a/src/modules/visibility/visibility.cpp b/src/modules/visibility/visibility.cpp index 8f7172dbaa..c6d02a148e 100644 --- a/src/modules/visibility/visibility.cpp +++ b/src/modules/visibility/visibility.cpp @@ -111,7 +111,7 @@ static void SetAllContactIcons(HWND hwndList) if (hItem) { DWORD flags; WORD status; - char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char *szProto = GetContactProto(hContact); if (szProto == NULL) { flags = 0; status = 0; -- cgit v1.2.3