From b660fac5560005706aeab0a0d5ad2b32bdcaf929 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 1 Jun 2015 17:20:04 +0000
Subject: - ProtoCallService() function considered too dangerous and therefore
 isn't exported anymore, it's closed in the core, CallProtoService() is used
 instead everywhere; - fixes for some quirks with PS_* calls.

git-svn-id: http://svn.miranda-ng.org/main/trunk@13959 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_nicer/skineditor/src/main.cpp | 3 +--
 plugins/Clist_nicer/src/clc.cpp             | 2 +-
 plugins/Clist_nicer/src/clcitems.cpp        | 2 +-
 plugins/Clist_nicer/src/clui.cpp            | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'plugins/Clist_nicer')

diff --git a/plugins/Clist_nicer/skineditor/src/main.cpp b/plugins/Clist_nicer/skineditor/src/main.cpp
index c3a652a135..3171cf3d86 100644
--- a/plugins/Clist_nicer/skineditor/src/main.cpp
+++ b/plugins/Clist_nicer/skineditor/src/main.cpp
@@ -730,8 +730,7 @@ static INT_PTR CALLBACK SkinEdit_ExtBkDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 			}
 			else if (item) {
 				char *szName = item->szName[0] == '{' ? &item->szName[3] : item->szName;
-
-				TextOutA(dis->hDC, dis->rcItem.left, dis->rcItem.top, szName, mir_strlen(szName));
+				TextOutA(dis->hDC, dis->rcItem.left, dis->rcItem.top, szName, (int)mir_strlen(szName));
 			}
 			return TRUE;
 		}
diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 0316c8170c..91b1dfface 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -584,7 +584,7 @@ LBL_Def:
 
 			if (contact) {
 				if (ProtoServiceExists(szProto, PS_GETADVANCEDSTATUSICON)) {
-					int iconId = ProtoCallService(szProto, PS_GETADVANCEDSTATUSICON, hContact, 0);
+					int iconId = CallProtoService(szProto, PS_GETADVANCEDSTATUSICON, hContact, 0);
 					if (iconId != -1)
 						contact->xStatusIcon = iconId >> 16;
 				}
diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index 1d610cd65d..19e2d7ceec 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -275,7 +275,7 @@ BYTE GetCachedStatusMsg(TExtraCache *p, char *szProto)
 			CUSTOM_STATUS cst = { sizeof(cst) };
 			cst.flags = CSSF_MASK_STATUS;
 			cst.status = &xStatus;
-			if (ProtoServiceExists(szProto, PS_GETCUSTOMSTATUSEX) && !ProtoCallService(szProto, PS_GETCUSTOMSTATUSEX, hContact, (LPARAM)&cst) && xStatus > 0) {
+			if (ProtoServiceExists(szProto, PS_GETCUSTOMSTATUSEX) && !CallProtoService(szProto, PS_GETCUSTOMSTATUSEX, hContact, (LPARAM)&cst) && xStatus > 0) {
 				cst.flags = CSSF_MASK_NAME | CSSF_DEFAULT_NAME | CSSF_TCHAR;
 				cst.wParam = &xStatus2;
 				cst.ptszName = xStatusName;
diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 2b2fe4328b..812c732e9c 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -1362,7 +1362,7 @@ skipbg:
 								if (contactOK) {
 									char *szProto = GetContactProto(hContact);
 									if (ProtoServiceExists(szProto, item->szService))
-										ProtoCallService(szProto, item->szService, wwParam, llParam);
+										CallProtoService(szProto, item->szService, wwParam, llParam);
 									else
 										serviceFailure = TRUE;
 								}
@@ -1691,7 +1691,7 @@ buttons_done:
 						CUSTOM_STATUS cst = { sizeof(cst) };
 						cst.flags = CSSF_MASK_STATUS;
 						cst.status = &xStatus;
-						if (ProtoServiceExists(pd->RealName, PS_GETCUSTOMSTATUSEX) && !ProtoCallService(pd->RealName, PS_GETCUSTOMSTATUSEX, 0, (LPARAM)&cst) && xStatus > 0)
+						if (ProtoServiceExists(pd->RealName, PS_GETCUSTOMSTATUSEX) && !CallProtoService(pd->RealName, PS_GETCUSTOMSTATUSEX, 0, (LPARAM)&cst) && xStatus > 0)
 							hIcon = (HICON)CallProtoService(pd->RealName, PS_GETCUSTOMSTATUSICON, 0, LR_SHARED); // get OWN xStatus icon (if set)
 						else
 							hIcon = LoadSkinnedProtoIcon(szProto, status);
-- 
cgit v1.2.3