From 52ab0aed54e6e8df874a7e1ef1c985d268dca4f3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Aug 2015 22:17:43 +0000 Subject: fixes warning & 64-bit issues git-svn-id: http://svn.miranda-ng.org/main/trunk@14973 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Msg_Export/src/FileViewer.cpp | 4 ++-- plugins/Msg_Export/src/utils.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/Msg_Export') diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp index 488eda2fd0..b68b96a430 100755 --- a/plugins/Msg_Export/src/FileViewer.cpp +++ b/plugins/Msg_Export/src/FileViewer.cpp @@ -666,7 +666,7 @@ bool bLoadFile(HWND hwndDlg, CLHistoryDlg * pclDlg) pclDlg->bUtf8File = clInfo.bUtf8File; } else { - eds.dwCookie = (DWORD)hFile; + eds.dwCookie = (DWORD_PTR)hFile; eds.pfnCallback = RichEditStreamLoadFile; SendMessage(hRichEdit, EM_STREAMIN, (WPARAM)SF_TEXT, (LPARAM)&eds); @@ -1116,7 +1116,7 @@ static INT_PTR CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam, } EDITSTREAM eds; - eds.dwCookie = (DWORD)hFile; + eds.dwCookie = (DWORD_PTR)hFile; eds.dwError = 0; eds.pfnCallback = RichEditStreamSaveFile; LRESULT nWriteOk = SendMessage(hRichEdit, EM_STREAMOUT, (WPARAM)SF_RTF, (LPARAM)&eds); diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp index 45de85d160..f078536f62 100755 --- a/plugins/Msg_Export/src/utils.cpp +++ b/plugins/Msg_Export/src/utils.cpp @@ -1133,10 +1133,10 @@ void ExportDBEventInfo(MCONTACT hContact, DBEVENTINFO &dbei) int n = mir_sntprintf(szTemp, _T("%d"), uin); if (bWriteTextToFile(hFile, szTemp, bWriteUTF8Format, n)) { char *pszEnd = (char *)(dbei.pBlob + dbei.cbSize); - for (int n = 0; n < nStringCount && pszCurBlobPos < pszEnd; n++) { + for (int i = 0; i < nStringCount && pszCurBlobPos < pszEnd; i++) { if (*pszCurBlobPos) { if (!bWriteNewLine(hFile, nIndent) || - !bWriteTextToFile(hFile, TranslateTS(pszTypes[n]), bWriteUTF8Format) || + !bWriteTextToFile(hFile, TranslateTS(pszTypes[i]), bWriteUTF8Format) || !bWriteIndentedToFile(hFile, nIndent, pszCurBlobPos, bWriteUTF8Format)) { break; } -- cgit v1.2.3