less TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 7 insertions, 7 deletions

diff --git a/plugins/AutoShutdown/src/frame.cpp b/plugins/AutoShutdown/src/frame.cpp
index 972102796f..f89a183373 100644
--- a/plugins/AutoShutdown/src/frame.cpp
+++ b/plugins/AutoShutdown/src/frame.cpp
@@ -422,7 +422,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwndFrame, UINT msg, WPARAM wParam, LP
 					if (hdc != NULL) {

 						if (dat->hFont != NULL)

 							hFontPrev = (HFONT)SelectObject(hdc, dat->hFont);

-						if (GetTextExtentPoint32(hdc, szOutput, (int)mir_tstrlen(szOutput), &size))

+						if (GetTextExtentPoint32(hdc, szOutput, (int)mir_wstrlen(szOutput), &size))

 							if (size.cx >= (rc.right - rc.left))

 								dat->flags &= FWPDF_TIMEISCLIPPED;

 						if (dat->hFont != NULL)

@@ -468,7 +468,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwndFrame, UINT msg, WPARAM wParam, LP
 						if (dat->fTimeFlags&SDWTF_ST_TIME)

 							GetFormatedDateTime(szTime, _countof(szTime), dat->settingLastTime, FALSE);

 						else GetFormatedCountdown(szTime, _countof(szTime), dat->countdown);

-						mir_sntprintf(ttdi->szText, L"%s %s", (dat->fTimeFlags&SDWTF_ST_TIME) ? TranslateT("Shutdown at:") : TranslateT("Time left:"), szTime);

+						mir_snwprintf(ttdi->szText, L"%s %s", (dat->fTimeFlags&SDWTF_ST_TIME) ? TranslateT("Shutdown at:") : TranslateT("Time left:"), szTime);

 						ttdi->lpszText = ttdi->szText;

 					}

 					return 0;

diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp
index 33a4e647c4..0488ef6a65 100644
--- a/plugins/AutoShutdown/src/settingsdlg.cpp
+++ b/plugins/AutoShutdown/src/settingsdlg.cpp
@@ -48,7 +48,7 @@ static BOOL CALLBACK DisplayCpuUsageProc(BYTE nCpuUsage, LPARAM lParam)
 		return FALSE; /* stop poll thread */

 

 	wchar_t str[64];

-	mir_sntprintf(str, TranslateT("(current: %u%%)"), nCpuUsage);

+	mir_snwprintf(str, TranslateT("(current: %u%%)"), nCpuUsage);

 	SetWindowText((HWND)lParam, str);

 	return TRUE;

 }

diff --git a/plugins/AutoShutdown/src/shutdownsvc.cpp b/plugins/AutoShutdown/src/shutdownsvc.cpp
index b77aab3558..e8ba15d8a0 100644
--- a/plugins/AutoShutdown/src/shutdownsvc.cpp
+++ b/plugins/AutoShutdown/src/shutdownsvc.cpp
@@ -384,7 +384,7 @@ static INT_PTR CALLBACK ShutdownDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 	case M_UPDATE_COUNTDOWN:  /* lParam=(WORD)countdown */

 		{

 			wchar_t szText[256];

-			mir_sntprintf(szText, TranslateTS(desc[shutdownType - 1]), lParam);

+			mir_snwprintf(szText, TranslateTS(desc[shutdownType - 1]), lParam);

 			SetDlgItemText(hwndDlg, IDC_TEXT_HEADER, szText);

 			/* countdown finished */

 			if (!lParam)

diff --git a/plugins/AutoShutdown/src/utils.cpp b/plugins/AutoShutdown/src/utils.cpp
index ffe41e4a0a..c6724ab982 100644
--- a/plugins/AutoShutdown/src/utils.cpp
+++ b/plugins/AutoShutdown/src/utils.cpp
@@ -52,7 +52,7 @@ void TrimString(wchar_t *pszStr)
 	wchar_t *psz, szChars[] = L" \r\n\t";

 	for (int i = 0; i < _countof(szChars); ++i) {

 		/* trim end */

-		psz = &pszStr[mir_tstrlen(pszStr) - 1];

+		psz = &pszStr[mir_wstrlen(pszStr) - 1];

 		while (pszStr[0] && *psz == szChars[i]) {

 			*psz = 0;

 			psz = CharPrev(pszStr, psz);

@@ -60,7 +60,7 @@ void TrimString(wchar_t *pszStr)
 		/* trim beginning */

 		for (psz = pszStr; (*psz && *psz == szChars[i]); psz = CharNext(psz))

 			;

-		memmove(pszStr, psz, (mir_tstrlen(psz) + 1)*sizeof(wchar_t));

+		memmove(pszStr, psz, (mir_wstrlen(psz) + 1)*sizeof(wchar_t));

 	}

 }

 

@@ -199,7 +199,7 @@ BOOL GetFormatedDateTime(wchar_t *pszOut, int nSize, time_t timestamp, BOOL fSho
 			return FALSE;

 		if (!GetDateFormat(locale, DATE_SHORTDATE, &st, NULL, szDate, _countof(szDate)))

 			return FALSE;

-		mir_sntprintf(pszOut, nSize, L"%s %s", szTime, szDate);

+		mir_snwprintf(pszOut, nSize, L"%s %s", szTime, szDate);

 		return TRUE;

 	}

 }