From ee697e0b699bcefec907c089e3ad455538c72c2f Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 24 May 2015 12:35:03 +0000 Subject: replace wcscpy to mir_wstrcpy replace wcscat to mir_wstrcat replace wcsncat to mir_wstrncat replace wcscmp to mir_wstrcmp replace wcsicmp to mir_wstrcmpi git-svn-id: http://svn.miranda-ng.org/main/trunk@13814 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/KeyboardNotify/src/flash.cpp | 4 ++-- plugins/KeyboardNotify/src/options.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/KeyboardNotify') diff --git a/plugins/KeyboardNotify/src/flash.cpp b/plugins/KeyboardNotify/src/flash.cpp index 22a86b2d63..6ec3f6a133 100644 --- a/plugins/KeyboardNotify/src/flash.cpp +++ b/plugins/KeyboardNotify/src/flash.cpp @@ -200,7 +200,7 @@ void useExternSequence(TCHAR *extStr) static FLASHING_SEQUENCE Extern = {0}; TCHAR externStr[MAX_PATH+1]; - wcscpy(externStr, extStr); + mir_wstrcpy(externStr, extStr); Extern = str2FS(normalizeCustomString(externStr)); @@ -215,7 +215,7 @@ TCHAR *normalizeCustomString(TCHAR *customStr) BOOL used[4]; TCHAR strAux[MAX_PATH+1], *str; - for (wcscpy(str=strAux, customStr); *str; str++) { + for (mir_wstrcpy(str=strAux, customStr); *str; str++) { switch (*str) { case _T('['): if (status == 0) { diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp index 75bbbda4b4..b21f7f8a3b 100644 --- a/plugins/KeyboardNotify/src/options.cpp +++ b/plugins/KeyboardNotify/src/options.cpp @@ -787,7 +787,7 @@ INT_PTR CALLBACK DlgProcThemeOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR str = (TCHAR *)SendDlgItemMessage(hwndDlg, IDC_THEME, CB_GETITEMDATA, (WPARAM)item, 0); if (str) { GetDlgItemText(hwndDlg, IDC_CUSTOMSTRING, customAux, SIZEOF(customAux)); - if (wcscmp(str, customAux)) + if (mir_wstrcmp(str, customAux)) EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATE), TRUE); else EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATE), FALSE); @@ -872,7 +872,7 @@ INT_PTR CALLBACK DlgProcThemeOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR ofn.hwndOwner = hwndDlg; ofn.hInstance = NULL; mir_tstrcpy(filter, TranslateT("Keyboard Notify Theme")); - wcscat(filter, _T(" (*.knt)")); + mir_wstrcat(filter, _T(" (*.knt)")); pfilter = filter + mir_tstrlen(filter) + 1; mir_tstrcpy(pfilter, _T("*.knt")); pfilter = pfilter + mir_tstrlen(pfilter) + 1; @@ -900,7 +900,7 @@ INT_PTR CALLBACK DlgProcThemeOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR ofn.hwndOwner = hwndDlg; ofn.hInstance = NULL; mir_tstrcpy(filter, TranslateT("Keyboard Notify Theme")); - wcscat(filter, _T(" (*.knt)")); + mir_wstrcat(filter, _T(" (*.knt)")); pfilter = filter + mir_tstrlen(filter) + 1; mir_tstrcpy(pfilter, _T("*.knt")); pfilter = pfilter + mir_tstrlen(pfilter) + 1; @@ -953,7 +953,7 @@ INT_PTR CALLBACK DlgProcThemeOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR else db_set_ts(NULL, KEYBDMODULE, fmtDBSettingName("custom%d", i), _T("")); - if (!wcscmp(theme, themeAux)) + if (!mir_wstrcmp(theme, themeAux)) wCustomTheme = i; // Here we will update the theme combo on the Flashing tab: horrible but can't imagine a better way right now -- cgit v1.2.3