From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Jul 2016 14:23:31 +0000 Subject: less TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ShellExt/src/options.cpp | 2 +- plugins/ShellExt/src/shlcom.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/ShellExt/src') diff --git a/plugins/ShellExt/src/options.cpp b/plugins/ShellExt/src/options.cpp index e052f2fda7..9fe7d6aee2 100644 --- a/plugins/ShellExt/src/options.cpp +++ b/plugins/ShellExt/src/options.cpp @@ -30,7 +30,7 @@ static void InitControls(HWND hwndDlg) int comReg = IsCOMRegistered(); wchar_t szBuf[MAX_PATH]; - mir_sntprintf(szBuf, L"%s (%s)", + mir_snwprintf(szBuf, L"%s (%s)", TranslateTS(COM_OKSTR[(comReg & COMREG_OK) != 0]), TranslateTS(COM_APPROVEDSTR[(comReg & COMREG_APPROVED) != 0])); SetDlgItemText(hwndDlg, IDC_STATUS, szBuf); diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp index f711fb1512..e984015fe7 100644 --- a/plugins/ShellExt/src/shlcom.cpp +++ b/plugins/ShellExt/src/shlcom.cpp @@ -301,7 +301,7 @@ bool ipcGetSortedContacts(THeaderIPC *ipch, int *pSlot, bool bGroupMode) // create an IPC slot for each contact and store display name, etc for (i = 0; i < dwContacts; i++) { - ptrA szContact(mir_t2a(pcli->pfnGetContactDisplayName(pContacts[i].hContact, 0))); + ptrA szContact(mir_u2a(pcli->pfnGetContactDisplayName(pContacts[i].hContact, 0))); if (szContact != NULL) { ptrA szGroup; if (bGroupMode) @@ -552,7 +552,7 @@ void CheckUnregisterServer() // launches regsvr to remove the dll under admin. wchar_t szFileName[MAX_PATH], szBuf[MAX_PATH * 2]; GetModuleFileName(hInst, szFileName, _countof(szFileName)); - mir_sntprintf(szBuf, L"/s /u \"%s\"", szFileName); + mir_snwprintf(szBuf, L"/s /u \"%s\"", szFileName); SHELLEXECUTEINFO sei = { sizeof(sei) }; sei.lpVerb = L"runas"; @@ -581,7 +581,7 @@ void CheckRegisterServer() TranslateT("Miranda NG - Shell context menus (shellext.dll)"), MB_OK | MB_ICONINFORMATION); // /s = silent GetModuleFileName(hInst, szFileName, _countof(szFileName)); - mir_sntprintf(szBuf, L"/s \"%s\"", szFileName); + mir_snwprintf(szBuf, L"/s \"%s\"", szFileName); SHELLEXECUTEINFO sei = { sizeof(sei) }; sei.lpVerb = L"runas"; -- cgit v1.2.3