summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-11-30 22:25:07 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-11-30 22:25:07 +0000
commitfc62f1f1e1f8af40a1f7efe0ba3afc358fb66ef3 (patch)
tree59fffc30bf8c4ead07742bdeceecb1d3e991c8e5
parentcc8010159eb49e389124c5fab3ed9ee0ec948d2a (diff)
more warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@11183 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--src/core/stdclist/src/clcpaint.cpp2
-rw-r--r--src/core/stdfile/file.cpp4
-rw-r--r--src/core/stduihist/history.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp
index 649c8123f7..809a369583 100644
--- a/src/core/stdclist/src/clcpaint.cpp
+++ b/src/core/stdclist/src/clcpaint.cpp
@@ -484,7 +484,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
rc.right = (clRect.right - clRect.left);
rc.bottom = rc.top;
if (qlen)
- DrawText(hdcMem, szText, qlen, &rc, DT_EDITCONTROL | DT_NOPREFIX | DT_NOCLIP | DT_WORD_ELLIPSIS | DT_SINGLELINE);
+ DrawText(hdcMem, szText, (int)qlen, &rc, DT_EDITCONTROL | DT_NOPREFIX | DT_NOCLIP | DT_WORD_ELLIPSIS | DT_SINGLELINE);
}
}
}
diff --git a/src/core/stdfile/file.cpp b/src/core/stdfile/file.cpp
index 5e5b32da4d..10a6269869 100644
--- a/src/core/stdfile/file.cpp
+++ b/src/core/stdfile/file.cpp
@@ -358,9 +358,9 @@ static void sttRecvCreateBlob(DBEVENTINFO &dbei, int fileCount, char **pszFiles,
dbei.cbBlob = sizeof(DWORD);
for (int i = 0; i < fileCount; i++)
- dbei.cbBlob += mir_strlen(pszFiles[i]) + 1;
+ dbei.cbBlob += (int)mir_strlen(pszFiles[i]) + 1;
- dbei.cbBlob += mir_strlen(szDescr) + 1;
+ dbei.cbBlob += (int)mir_strlen(szDescr) + 1;
if ((dbei.pBlob = (BYTE*)mir_alloc(dbei.cbBlob)) == 0)
return;
diff --git a/src/core/stduihist/history.cpp b/src/core/stduihist/history.cpp
index 96de2a056e..62f58b453b 100644
--- a/src/core/stduihist/history.cpp
+++ b/src/core/stduihist/history.cpp
@@ -326,7 +326,7 @@ static INT_PTR CALLBACK DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wParam, LP
TCHAR str[1024];
GetObjectDescription(&dbei, str, SIZEOF(str));
if (str[0]) {
- CharUpperBuff(str, mir_tstrlen(str));
+ CharUpperBuff(str, (int)mir_tstrlen(str));
if (_tcsstr(str, (const TCHAR*)lParam) != NULL) {
SendDlgItemMessage(hwndDlg, IDC_LIST, LB_SETCURSEL, index, 0);
SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDC_LIST, LBN_SELCHANGE), 0);
@@ -355,7 +355,7 @@ static INT_PTR CALLBACK DlgProcHistoryFind(HWND hwndDlg, UINT msg, WPARAM wParam
TCHAR str[128];
HWND hwndParent = (HWND)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
GetDlgItemText(hwndDlg, IDC_FINDWHAT, str, SIZEOF(str));
- CharUpperBuff(str, mir_tstrlen(str));
+ CharUpperBuff(str, (int)mir_tstrlen(str));
SendMessage(hwndParent, DM_FINDNEXT, 0, (LPARAM)str);
return TRUE;
}