From e48bae4c6ccf1003916b3960f30816ce8aaa955b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 31 May 2015 21:02:26 +0000 Subject: - additional operator LPARAM() for _A2T & _T2A; - we don't need StrConvA anymore; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@13952 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/src/options.cpp | 6 +++--- plugins/SecureIM/src/svcs_proto.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/SecureIM') diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index 157ac96f8d..cadba31b28 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -471,7 +471,7 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR case LVN_COLUMNCLICK: bChangeSortOrder = true; - ListView_Sort(hLV, (LPARAM)(LPNMLISTVIEW(lParam)->iSubItem + 0x01)); + ListView_Sort(hLV, LPNMLISTVIEW(lParam)->iSubItem + 0x01); bChangeSortOrder = false; } break; @@ -735,7 +735,7 @@ INT_PTR CALLBACK DlgProcOptionsPGP(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l switch (((LPNMHDR)lParam)->code) { case LVN_COLUMNCLICK: bChangeSortOrder = true; - ListView_Sort(hLV, (LPARAM)(LPNMLISTVIEW(lParam)->iSubItem + 0x11)); + ListView_Sort(hLV, LPNMLISTVIEW(lParam)->iSubItem + 0x11); bChangeSortOrder = false; break; } @@ -858,7 +858,7 @@ INT_PTR CALLBACK DlgProcOptionsGPG(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l case LVN_COLUMNCLICK: bChangeSortOrder = true; - ListView_Sort(hLV, (LPARAM)(LPNMLISTVIEW(lParam)->iSubItem + 0x21)); + ListView_Sort(hLV, LPNMLISTVIEW(lParam)->iSubItem + 0x21); bChangeSortOrder = false; } } diff --git a/plugins/SecureIM/src/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp index e1b9d45e13..13a3ee9445 100644 --- a/plugins/SecureIM/src/svcs_proto.cpp +++ b/plugins/SecureIM/src/svcs_proto.cpp @@ -234,7 +234,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) CallService(MS_PROTO_CHAINSEND, wParam, lParam); // send back cipher message ptrA keyToSend(InitKeyA(ptr, 0)); // calculate public and private key - pccsd->lParam = (LPARAM)(char*)keyToSend; + pccsd->lParam = keyToSend; CallService(MS_PROTO_CHAINSEND, wParam, lParam); // send new key showPopup(sim005, NULL, g_hPOP[POP_PU_DIS], 0); @@ -394,7 +394,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) Sent_NetLog("onRecvMsg: Sending KEYB %s", keyToSend); pccsd->wParam |= PREF_METANODB; - pccsd->lParam = (LPARAM)keyToSend; + pccsd->lParam = keyToSend; pccsd->szProtoService = PSS_MESSAGE; CallService(MS_PROTO_CHAINSEND, wParam, lParam); } @@ -450,7 +450,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) // SendMsg handler INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) { - CCSDATA *pccsd = (CCSDATA *)lParam; + CCSDATA *pccsd = (CCSDATA*)lParam; pUinKey ptr = getUinKey(pccsd->hContact); int ssig = getSecureSig((LPCSTR)pccsd->lParam); int stat = getContactStatus(pccsd->hContact); @@ -713,7 +713,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) Sent_NetLog("onSend: encrypted msg '%s'", szNewMsg); pccsd->wParam |= PREF_METANODB; - pccsd->lParam = (LPARAM)(char*)szNewMsg; + pccsd->lParam = szNewMsg; pccsd->szProtoService = PSS_MESSAGE; int ret = CallService(MS_PROTO_CHAINSEND, wParam, lParam); -- cgit v1.2.3