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/modules/utils/path.cpp | 4 ++-- src/modules/utils/timezones.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/modules/utils') 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); -- cgit v1.2.3