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/DbEditorPP/src/findwindow.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/DbEditorPP/src/findwindow.cpp') diff --git a/plugins/DbEditorPP/src/findwindow.cpp b/plugins/DbEditorPP/src/findwindow.cpp index 3769825cd9..b97dd4ab0d 100644 --- a/plugins/DbEditorPP/src/findwindow.cpp +++ b/plugins/DbEditorPP/src/findwindow.cpp @@ -127,7 +127,7 @@ INT_PTR CALLBACK FindWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP if (IsDlgButtonChecked(hwnd, IDC_ENTIRELY)) fi->options |= F_ENTIRE; - fi->replace = mir_tstrdup(replace); + fi->replace = mir_wstrdup(replace); SetDlgItemText(hwnd, IDOK, TranslateT("Stop")); EnableWindow(GetDlgItem(hwnd, IDC_SEARCH), 0); @@ -138,7 +138,7 @@ INT_PTR CALLBACK FindWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP EnableWindow(GetDlgItem(hwnd, IDOK), 0); } - fi->search = mir_tstrdup(text); + fi->search = mir_wstrdup(text); ListView_DeleteAllItems(fi->hwnd); SetWindowLongPtr(GetDlgItem(hwnd, IDC_SEARCH), GWLP_USERDATA, 1); @@ -459,15 +459,15 @@ void __cdecl FindSettings(LPVOID param) break; case DBVT_WCHAR: - if (!value) value = mir_u2t(dbv.pwszVal); + if (!value) value = mir_wstrdup(dbv.pwszVal); case DBVT_UTF8: - if (!value) value = mir_utf8decodeT(dbv.pszVal); + if (!value) value = mir_utf8decodeW(dbv.pszVal); case DBVT_ASCIIZ: - if (!value) value = mir_a2t(dbv.pszVal); + if (!value) value = mir_a2u(dbv.pszVal); if (FindMatchT(value, fi->search, fi->options)) { foundCount++; - ptrT ptr; + ptrW ptr; wchar_t *newValue = value; int flag = F_SETVAL; @@ -568,7 +568,7 @@ void __cdecl FindSettings(LPVOID param) } wchar_t msg[MSG_SIZE]; - mir_sntprintf(msg, TranslateT("Finished. Items found: %d / replaced: %d / deleted: %d"), foundCount, replaceCount, deleteCount); + mir_snwprintf(msg, TranslateT("Finished. Items found: %d / replaced: %d / deleted: %d"), foundCount, replaceCount, deleteCount); SendDlgItemMessage(hwndParent, IDC_SBAR, SB_SETTEXT, 0, (LPARAM)msg); if (fi->replace) { -- cgit v1.2.3