From 64936da361b3bd1c561829ffd02df1b8ec83e93b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 24 Apr 2013 17:45:05 +0000 Subject: warning fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@4525 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/skype_account.cpp | 2 +- protocols/Skype/src/skype_database.cpp | 4 ++-- protocols/Skype/src/skype_dialogs.cpp | 4 ++-- protocols/Skype/src/skype_events.cpp | 2 +- protocols/Skype/src/skype_profile.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/protocols/Skype/src/skype_account.cpp b/protocols/Skype/src/skype_account.cpp index 6c9d45be2a..e318a6672a 100644 --- a/protocols/Skype/src/skype_account.cpp +++ b/protocols/Skype/src/skype_account.cpp @@ -190,7 +190,7 @@ bool CSkypeProto::IsAvatarChanged(const SEBinary &avatar) bool result = false; ::mir_md5_byte_t digest[16]; - ::mir_md5_hash((PBYTE)avatar.data(), avatar.size(), digest); + ::mir_md5_hash((PBYTE)avatar.data(), (int)avatar.size(), digest); DBVARIANT dbv; ::db_get(NULL, this->m_szModuleName, "AvatarHash", &dbv); diff --git a/protocols/Skype/src/skype_database.cpp b/protocols/Skype/src/skype_database.cpp index 8884cb2485..4eb92678d7 100644 --- a/protocols/Skype/src/skype_database.cpp +++ b/protocols/Skype/src/skype_database.cpp @@ -69,13 +69,13 @@ void CSkypeProto::RaiseAuthRequestEvent(DWORD timestamp, CContact::Ref contact) /*blob is: 0(DWORD), hContact(DWORD), nick(ASCIIZ), firstName(ASCIIZ), lastName(ASCIIZ), sid(ASCIIZ), reason(ASCIIZ)*/ DWORD cbBlob = (DWORD) - (sizeof(DWORD) * 2) + + (sizeof(DWORD) * 2 + ::strlen(nick) + ::strlen(firstName) + ::strlen(lastName) + ::strlen(sid) + ::strlen(reason) + - 5; + 5); PBYTE pBlob, pCurBlob; pCurBlob = pBlob = (PBYTE)::mir_alloc(cbBlob); diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp index 71bf155c5f..d08131a3d7 100644 --- a/protocols/Skype/src/skype_dialogs.cpp +++ b/protocols/Skype/src/skype_dialogs.cpp @@ -67,7 +67,7 @@ INT_PTR CALLBACK CSkypeProto::SkypeMainOptionsProc(HWND hwnd, UINT message, WPAR { wchar_t sid[128]; GetDlgItemText(hwnd, IDC_SL, sid, SIZEOF(sid)); - EnableWindow(GetDlgItem(hwnd, IDC_REGISTER), ::wcslen(sid)); + EnableWindow(GetDlgItem(hwnd, IDC_REGISTER), ::wcslen(sid) != 0); } SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); } @@ -80,7 +80,7 @@ INT_PTR CALLBACK CSkypeProto::SkypeMainOptionsProc(HWND hwnd, UINT message, WPAR { char pwd[128]; GetDlgItemTextA(hwnd, IDC_SL, pwd, SIZEOF(pwd)); - EnableWindow(GetDlgItem(hwnd, IDC_CHANGE_PWD), ::strlen(pwd)); + EnableWindow(GetDlgItem(hwnd, IDC_CHANGE_PWD), ::strlen(pwd) != 0); } SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); } diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp index 91731fbd6a..d88d6016e2 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/protocols/Skype/src/skype_events.cpp @@ -468,7 +468,7 @@ void CSkypeProto::OnMessage(CConversation::Ref conversation, CMessage::Ref messa SKYPE_DB_EVENT_TYPE_CALL, timestamp, DBEF_UTF, - ::wcslen(message) + 1, + (DWORD)::wcslen(message) + 1, (PBYTE)message); break; diff --git a/protocols/Skype/src/skype_profile.cpp b/protocols/Skype/src/skype_profile.cpp index 0a2a4915c9..412a6fc04c 100644 --- a/protocols/Skype/src/skype_profile.cpp +++ b/protocols/Skype/src/skype_profile.cpp @@ -61,7 +61,7 @@ void CSkypeProto::UpdateProfileAvatar(SEObject *obj, HANDLE hContact) else { ::mir_md5_byte_t digest[16]; - ::mir_md5_hash((BYTE*)data.data(), data.size(), digest); + ::mir_md5_hash((BYTE*)data.data(), (int)data.size(), digest); ::db_set_blob(hContact, this->m_szModuleName, "AvatarHash", digest, 16); ::CallService(MS_AV_SETMYAVATART, (WPARAM)m_szModuleName, (LPARAM)path); -- cgit v1.2.3