From 427891e0d28becb428ae8435954399f2e4daa9fe Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 1 Mar 2013 22:52:26 +0000
Subject: service call replaced with helper: MS_UTILS_PATHTOABSOLUTEW

git-svn-id: http://svn.miranda-ng.org/main/trunk@3827 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 .../UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp   | 10 ++++------
 plugins/UserInfoEx/src/mir_icolib.cpp                   | 17 ++++++-----------
 plugins/UserInfoEx/src/svc_avatar.cpp                   |  2 +-
 3 files changed, 11 insertions(+), 18 deletions(-)

(limited to 'plugins/UserInfoEx/src')

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
index c00751dabe..132d5b4107 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
@@ -234,19 +234,17 @@ static VOID GetInitialDir(LPSTR pszInitialDir)
 
 	// is some standard path defined
 	if (!DB::Setting::GetStatic(0, MODNAME, "vCardPath", szRelative, SIZEOF(szRelative))) {
-		if (!CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)szRelative, (WPARAM)pszInitialDir))
+		if ( !PathToAbsolute(szRelative, pszInitialDir))
 			strcpy(pszInitialDir, szRelative);
 	}
 	else if (//try to use environment variables supported by pathpatch of db3xSA
 		!ServiceExists(MS_DB_GETPROFILEPATH_BASIC) ||		
-		!CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)PROFILEPATH "\\" PROFILENAME, (WPARAM)pszInitialDir)
-	 ) {
+		!PathToAbsolute(PROFILEPATH "\\" PROFILENAME, pszInitialDir)) {
 		// use standard path to absolute
-		if (!CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"", (WPARAM)pszInitialDir))
+		if ( !PathToAbsolute("", pszInitialDir))
 			*pszInitialDir = 0;
 	}
-	else
-		*pszInitialDir = 0;
+	else *pszInitialDir = 0;
 }
 
 /**
diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp
index 2b77314895..1cc6a5c59a 100644
--- a/plugins/UserInfoEx/src/mir_icolib.cpp
+++ b/plugins/UserInfoEx/src/mir_icolib.cpp
@@ -140,13 +140,10 @@ LPTSTR IcoLib_GetDefaultIconFileName()
 	};
 	TCHAR absolute[MAX_PATH];
 
-	for (INT i = 0; i < SIZEOF(path); i++)
-	{
-		CallService(MS_UTILS_PATHTOABSOLUTET, (WPARAM)path[i], (LPARAM)absolute);
-		if (PathFileExists(absolute))
-		{
+	for (INT i = 0; i < SIZEOF(path); i++) {
+		PathToAbsoluteT(path[i], absolute);
+		if ( PathFileExists(absolute))
 			return path[i];
-		}
 	}
 	return NULL;
 }
@@ -167,12 +164,10 @@ static VOID IcoLib_CheckIconPackVersion(LPTSTR szIconPack)
 	{
 		if (szIconPack)
 		{
-			TCHAR		szAbsolutePath[MAX_PATH];
-			HMODULE hIconDll;
-
-			CallService(MS_UTILS_PATHTOABSOLUTET, (WPARAM)szIconPack, (LPARAM)szAbsolutePath);
+			TCHAR szAbsolutePath[MAX_PATH];
+			PathToAbsoluteT(szIconPack, szAbsolutePath);
 
-			hIconDll = LoadLibrary(szAbsolutePath);
+			HMODULE hIconDll = LoadLibrary(szAbsolutePath);
 			if (hIconDll) 
 			{
 				CHAR szFileVersion[64];
diff --git a/plugins/UserInfoEx/src/svc_avatar.cpp b/plugins/UserInfoEx/src/svc_avatar.cpp
index 450538e02f..129fc95084 100644
--- a/plugins/UserInfoEx/src/svc_avatar.cpp
+++ b/plugins/UserInfoEx/src/svc_avatar.cpp
@@ -177,7 +177,7 @@ namespace NServices
 							absolute[0] = '\0';
 
 							// check if file exists
-							if (!CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dbv.pszVal, (LPARAM)absolute))
+							if ( !PathToAbsolute(dbv.pszVal, absolute))
 							{
 								FILE *f = fopen(absolute, "rb");
 								if (f) {
-- 
cgit v1.2.3