From 688f55ba998c19304a29727c910504903f4cc49a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 30 Nov 2014 18:51:36 +0000
Subject: lstr* replacements

git-svn-id: http://svn.miranda-ng.org/main/trunk@11176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/langpack/langpack.cpp | 6 +++---
 src/modules/langpack/lpopts.cpp   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/modules/langpack')

diff --git a/src/modules/langpack/langpack.cpp b/src/modules/langpack/langpack.cpp
index 30f9f1dcf7..f6110cbbdf 100644
--- a/src/modules/langpack/langpack.cpp
+++ b/src/modules/langpack/langpack.cpp
@@ -47,7 +47,7 @@ BOOL EnumLangpacks(ENUM_PACKS_CALLBACK callback, WPARAM wParam, LPARAM lParam)
 			if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue;
 			/* get data */
 			PathToAbsoluteT(_T("\\Languages\\"), tszFullPath);
-			lstrcat(tszFullPath, wfd.cFileName);
+			mir_tstrcat(tszFullPath, wfd.cFileName);
 
 			LANGPACK_INFO pack;
 			if (!LoadLangPackDescr(tszFullPath, &pack)) {
@@ -69,14 +69,14 @@ BOOL EnumLangpacks(ENUM_PACKS_CALLBACK callback, WPARAM wParam, LPARAM lParam)
 	if (callback != NULL) {
 		LANGPACK_INFO pack;
 		pack.Locale = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
-		lstrcpy(pack.tszLanguage, _T("English"));
+		mir_tstrcpy(pack.tszLanguage, _T("English"));
 		pack.szAuthors = "Miranda NG Development Team";
 		pack.szAuthorEmail = "project-info@miranda-ng.org";
 		DWORD v = CallService(MS_SYSTEM_GETVERSION, 0, 0);
 		pack.szLastModifiedUsing.Format("%d.%d.%d", ((v >> 24) & 0xFF), ((v >> 16) & 0xFF), ((v >> 8) & 0xFF));
 		/* file date */
 		if (GetModuleFileName(NULL, pack.tszFullPath, SIZEOF(pack.tszFullPath))) {
-			lstrcpy(pack.tszFileName, _T("default"));
+			mir_tstrcpy(pack.tszFileName, _T("default"));
 			HANDLE hFile = CreateFile(pack.tszFileName, 0, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
 			if (hFile != INVALID_HANDLE_VALUE) {
 				GetFileTime(hFile, NULL, NULL, &pack.ftFileDate);
diff --git a/src/modules/langpack/lpopts.cpp b/src/modules/langpack/lpopts.cpp
index 29cf41df41..7b960b6a40 100644
--- a/src/modules/langpack/lpopts.cpp
+++ b/src/modules/langpack/lpopts.cpp
@@ -47,8 +47,8 @@ static void DisplayPackInfo(HWND hwndDlg, const LANGPACK_INFO *pack)
 			if (!IsValidLocale(pack->Locale, LCID_INSTALLED)) {
 				TCHAR *pszIncompat;
 				pszIncompat = TranslateT("(incompatible)");
-				szLocaleName[SIZEOF(szLocaleName) - lstrlen(pszIncompat) - 1] = 0;
-				lstrcat(lstrcat(szLocaleName, _T(" ")), pszIncompat);
+				szLocaleName[SIZEOF(szLocaleName) - mir_tstrlen(pszIncompat) - 1] = 0;
+				mir_tstrcat(mir_tstrcat(szLocaleName, _T(" ")), pszIncompat);
 			}
 			SetDlgItemText(hwndDlg, IDC_LANGLOCALE, szLocaleName);
 		}
@@ -124,7 +124,7 @@ INT_PTR CALLBACK DlgLangpackOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		case IDC_LANGEMAIL:
 			{
 				char buf[512];
-				lstrcpyA(buf, "mailto:");
+				mir_strcpy(buf, "mailto:");
 				if (GetWindowTextA(GetDlgItem(hwndDlg, LOWORD(wParam)), &buf[7], SIZEOF(buf)-7))
 					CallService(MS_UTILS_OPENURL, FALSE, (LPARAM)buf);
 			}
@@ -167,7 +167,7 @@ INT_PTR CALLBACK DlgLangpackOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				LANGPACK_INFO *pack = (LANGPACK_INFO*)ComboBox_GetItemData(hwndList, i);
 				if (i == idx) {
 					db_set_ts(NULL, "Langpack", "Current", pack->tszFileName);
-					lstrcpy(tszPath, pack->tszFullPath);
+					mir_tstrcpy(tszPath, pack->tszFullPath);
 					pack->flags |= LPF_ENABLED;
 				}
 				else pack->flags &= ~LPF_ENABLED;
-- 
cgit v1.2.3