From 4f0e30cdf56fbafdf955bbe8b93930bab9e39bd0 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Sun, 30 Nov 2014 18:33:56 +0000 Subject: Fix buf size for Get/Set text, open/save file name SMS: SIZE_T -> size_t MRA: small code cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@11175 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdfile/fileopts.cpp | 4 ++-- src/modules/langpack/lpopts.cpp | 2 +- src/modules/netlib/netliblog.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/core/stdfile/fileopts.cpp b/src/core/stdfile/fileopts.cpp index cc36766a66..a7c361de7e 100644 --- a/src/core/stdfile/fileopts.cpp +++ b/src/core/stdfile/fileopts.cpp @@ -187,7 +187,7 @@ static INT_PTR CALLBACK DlgProcFileOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L if (str[0] == '"') { TCHAR *pszQuote = _tcschr(str + 1, '"'); if (pszQuote) *pszQuote = 0; - MoveMemory(str, str + 1, _tcslen(str) * sizeof(TCHAR)); + MoveMemory(str, str + 1, (_tcslen(str) * sizeof(TCHAR))); } else { TCHAR *pszSpace = _tcschr(str, ' '); @@ -196,7 +196,7 @@ static INT_PTR CALLBACK DlgProcFileOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L ofn.nMaxFileTitle = MAX_PATH; if (!GetOpenFileName(&ofn)) break; if (_tcschr(str, ' ') != NULL) { - MoveMemory(str + 1, str, SIZEOF(str) - 2 * sizeof(TCHAR)); + MoveMemory(str + 1, str, ((SIZEOF(str) - 2) * sizeof(TCHAR))); str[0] = '"'; _tcscat(str, _T("\"")); } diff --git a/src/modules/langpack/lpopts.cpp b/src/modules/langpack/lpopts.cpp index a6963d89b1..29cf41df41 100644 --- a/src/modules/langpack/lpopts.cpp +++ b/src/modules/langpack/lpopts.cpp @@ -125,7 +125,7 @@ INT_PTR CALLBACK DlgLangpackOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP { char buf[512]; lstrcpyA(buf, "mailto:"); - if (GetWindowTextA(GetDlgItem(hwndDlg, LOWORD(wParam)), &buf[7], sizeof(buf)-7)) + if (GetWindowTextA(GetDlgItem(hwndDlg, LOWORD(wParam)), &buf[7], SIZEOF(buf)-7)) CallService(MS_UTILS_OPENURL, FALSE, (LPARAM)buf); } break; diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp index e48a4e408c..330e8e3588 100644 --- a/src/modules/netlib/netliblog.cpp +++ b/src/modules/netlib/netliblog.cpp @@ -187,7 +187,7 @@ static INT_PTR CALLBACK LogOptionsDlgProc(HWND hwndDlg, UINT message, WPARAM wPa return 1; if (LOWORD(wParam) == IDC_RUNATSTARTBROWSE && _tcschr(str, ' ') != NULL) { - MoveMemory(str + 1, str, SIZEOF(str) - 2); + MoveMemory(str + 1, str, ((SIZEOF(str) - 2) * sizeof(TCHAR))); str[0] = '"'; lstrcat(str, _T("\"")); } @@ -196,7 +196,7 @@ static INT_PTR CALLBACK LogOptionsDlgProc(HWND hwndDlg, UINT message, WPARAM wPa break; case IDC_RUNNOW: - GetDlgItemText(hwndDlg, IDC_RUNATSTART, str, MAX_PATH); + GetDlgItemText(hwndDlg, IDC_RUNATSTART, str, SIZEOF(str)); if (str[0]) { STARTUPINFO si = { sizeof(si) }; PROCESS_INFORMATION pi; @@ -205,7 +205,7 @@ static INT_PTR CALLBACK LogOptionsDlgProc(HWND hwndDlg, UINT message, WPARAM wPa break; case IDOK: - GetDlgItemText(hwndDlg, IDC_RUNATSTART, str, MAX_PATH); + GetDlgItemText(hwndDlg, IDC_RUNATSTART, str, SIZEOF(str)); db_set_ts(NULL, "Netlib", "RunAtStart", str); db_set_b(NULL, "Netlib", "ShowLogOptsAtStart", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWTHISDLGATSTART)); -- cgit v1.2.3