summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-09-16 11:55:27 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-09-16 11:55:27 +0000
commit7c5ba0561609916f1876d886b589e0bc59f6a413 (patch)
tree27bb0d74860412037f04a85c59f42caec10cb067
parent5161fd3fe53b85f579cfece81e25b562f1fa56ae (diff)
warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@1577 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rwxr-xr-xplugins/Msg_Export/src/FileViewer.cpp17
-rw-r--r--src/modules/protocols/protocols.cpp2
2 files changed, 9 insertions, 10 deletions
diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp
index 35d3c24df7..521d647021 100755
--- a/plugins/Msg_Export/src/FileViewer.cpp
+++ b/plugins/Msg_Export/src/FileViewer.cpp
@@ -701,7 +701,7 @@ bool bLoadFile( HWND hwndDlg , CLHistoryDlg * pclDlg )
if( hFile == INVALID_HANDLE_VALUE )
{
- int nDBCount = CallService( MS_DB_EVENT_GETCOUNT , (WPARAM)(pclDlg->hContact) ,0 );
+ int nDBCount = (int)CallService( MS_DB_EVENT_GETCOUNT , (WPARAM)(pclDlg->hContact) ,0 );
_TCHAR szTmp[1500];
if( nDBCount == -1 )
@@ -788,7 +788,7 @@ bool bLoadFile( HWND hwndDlg , CLHistoryDlg * pclDlg )
sData.flags = GTL_NUMCHARS;
sData.flags = GTL_DEFAULT;
- DWORD dwDataRead = SendMessage( hRichEdit , EM_GETTEXTLENGTHEX, (WPARAM)&sData , 0 );
+ DWORD dwDataRead = (DWORD)SendMessage( hRichEdit , EM_GETTEXTLENGTHEX, (WPARAM)&sData , 0 );
SendMessage( hRichEdit , EM_SETSEL , dwDataRead - 1, dwDataRead - 1 );
if( ! bScrollToBottom )
@@ -949,19 +949,18 @@ LRESULT CALLBACK EditSubclassProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM)&ft.chrg);
ft.chrg.cpMin = ft.chrg.cpMax+1;
ft.chrg.cpMax = -1;
- int res = SendMessage(hwnd, EM_FINDTEXT, (WPARAM)fr->Flags,(LPARAM)&ft);
- if(res == -1)
- {
+ LRESULT res = SendMessage(hwnd, EM_FINDTEXT, (WPARAM)fr->Flags,(LPARAM)&ft);
+ if(res == -1) {
ft.chrg.cpMin = 0;
- res = SendMessage(hwnd, EM_FINDTEXT, (WPARAM)fr->Flags,(LPARAM)&ft);
+ res = (int)SendMessage(hwnd, EM_FINDTEXT, (WPARAM)fr->Flags,(LPARAM)&ft);
if(res == -1)
{
MessageBox( hwnd , LPGENT("Search string was not found !"),MSG_BOX_TITEL,MB_OK );
return 0;
}
}
- ft.chrg.cpMin = res;
- ft.chrg.cpMax = res + _tcslen(fr->lpstrFindWhat);
+ ft.chrg.cpMin = LONG(res);
+ ft.chrg.cpMax = LONG(res + _tcslen(fr->lpstrFindWhat));
SendMessage(hwnd , EM_EXSETSEL, 0, (LPARAM)&ft.chrg);
return 0;
}
@@ -1307,7 +1306,7 @@ static INT_PTR CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam,
eds.dwCookie = (DWORD )hFile;
eds.dwError = 0;
eds.pfnCallback = RichEditStreamSaveFile;
- int nWriteOk = SendMessage(hRichEdit, EM_STREAMOUT, (WPARAM)SF_RTF , (LPARAM)&eds);
+ LRESULT nWriteOk = SendMessage(hRichEdit, EM_STREAMOUT, (WPARAM)SF_RTF , (LPARAM)&eds);
if( nWriteOk <= 0 || eds.dwError != 0 )
{
DisplayLastError( LPGENT("Failed to save file") );
diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp
index fb3c33e644..44b2f514bb 100644
--- a/src/modules/protocols/protocols.cpp
+++ b/src/modules/protocols/protocols.cpp
@@ -161,7 +161,7 @@ static INT_PTR Proto_RecvMessage(WPARAM, LPARAM lParam)
if (pre->flags & PREF_UNICODE) {
pszTemp = mir_utf8encodeT(pre->tszMessage);
dbei.pBlob = (PBYTE)(char*)pszTemp;
- dbei.cbBlob = strlen(pszTemp) + 1;
+ dbei.cbBlob = (DWORD)strlen(pszTemp) + 1;
dbei.flags |= DBEF_UTF;
}
else {