From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 29 Jul 2016 12:36:34 +0000
Subject: no more TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/AssocMgr/src/assoclist.cpp | 8 ++++----
 plugins/AssocMgr/src/reg.cpp       | 2 +-
 plugins/AssocMgr/src/test.cpp      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/AssocMgr')

diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp
index 7305022b0b..d50b40b464 100644
--- a/plugins/AssocMgr/src/assoclist.cpp
+++ b/plugins/AssocMgr/src/assoclist.cpp
@@ -66,7 +66,7 @@ static void SetAssocEnabled(const ASSOCDATA *assoc, BOOL fEnabled)
 		if (GetModuleFileName(assoc->hInstance, szBuf, _countof(szBuf)))
 			if (PathToRelativeT(szBuf, szDLL)) {
 				mir_snprintf(szSetting, "module_%s", assoc->pszClassName);
-				db_set_ts(NULL, "AssocMgr", szSetting, szDLL);
+				db_set_ws(NULL, "AssocMgr", szSetting, szDLL);
 			}
 }
 
@@ -96,8 +96,8 @@ void CleanupAssocEnabledSettings(void)
 		for (i = 0; i < nSettingsCount; ++i) {
 			pszSuffix = &ppszSettings[i][8];
 			mir_snprintf(szSetting, "module_%s", pszSuffix);
-			if (!db_get_ts(NULL, "AssocMgr", szSetting, &dbv)) {
-				if (PathToAbsoluteT(dbv.ptszVal, szDLL)) {
+			if (!db_get_ws(NULL, "AssocMgr", szSetting, &dbv)) {
+				if (PathToAbsoluteW(dbv.ptszVal, szDLL)) {
 					// file still exists?
 					hFile = CreateFile(szDLL, 0, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
 					if (hFile == INVALID_HANDLE_VALUE) {
@@ -980,7 +980,7 @@ void InitAssocList(void)
 		ftd.cbSize = sizeof(FILETYPEDESC);
 		ftd.pszFileExt = ".dat";
 		ftd.pszMimeType = NULL;
-		ftd.ptszDescription = TranslateT("Miranda NG database");
+		ftd.pwszDescription = TranslateT("Miranda NG database");
 		ftd.hInstance = hInst;
 		ftd.nIconResID = IDI_MIRANDAFILE;
 		ftd.ptszVerbDesc = NULL;
diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp
index 842ce654a3..84d1705f63 100644
--- a/plugins/AssocMgr/src/reg.cpp
+++ b/plugins/AssocMgr/src/reg.cpp
@@ -127,7 +127,7 @@ wchar_t *MakeRunCommand(BOOL fMirExe,BOOL fFixedDbProfile)
 {
 	wchar_t szDbFile[MAX_PATH], szExe[MAX_PATH], *pszFmt;
 	if (fFixedDbProfile) {
-		if ( CallService(MS_DB_GETPROFILENAMET, _countof(szDbFile), (LPARAM)szDbFile))
+		if ( CallService(MS_DB_GETPROFILENAMEW, _countof(szDbFile), (LPARAM)szDbFile))
 			return NULL;
 		wchar_t *p = wcsrchr(szDbFile, '.');
 		if (p)
diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp
index f0d60e6276..2722545302 100644
--- a/plugins/AssocMgr/src/test.cpp
+++ b/plugins/AssocMgr/src/test.cpp
@@ -42,7 +42,7 @@ __inline static int AssocMgr_AddNewFileTypeT(const char *ext, const char *mime,
 	ftd.cbSize = sizeof(FILETYPEDESC);
 	ftd.pszFileExt = ext;
 	ftd.pszMimeType = mime;
-	ftd.ptszDescription = desc;
+	ftd.pwszDescription = desc;
 	ftd.hInstance = hinst;
 	ftd.nIconResID = iconid;
 	ftd.ptszVerbDesc = verb;
-- 
cgit v1.2.3