From b5b57169c2833b9e70cc4cff7cae127c11f02683 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Sat, 13 Dec 2014 09:25:14 +0000 Subject: CopyMemory -> memcpy git-svn-id: http://svn.miranda-ng.org/main/trunk@11363 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/EmLanProto/src/mlan.cpp | 10 +++++----- protocols/IRCG/src/services.cpp | 2 +- protocols/Tlen/src/tlen_presence.cpp | 2 +- protocols/Xfire/src/Xfire_base.cpp | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'protocols') diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp index 2e170253ab..df0db3b074 100644 --- a/protocols/EmLanProto/src/mlan.cpp +++ b/protocols/EmLanProto/src/mlan.cpp @@ -298,7 +298,7 @@ void CMLan::OnRecvPacket(u_char* mes, int len, in_addr from) cont->m_status = ID_STATUS_OFFLINE; int nlen = (int)strlen(pak.strName); cont->m_nick = new char[nlen+1]; - CopyMemory(cont->m_nick, pak.strName, nlen+1); + memcpy(cont->m_nick, pak.strName, nlen+1); m_pRootContact = cont; } else @@ -308,7 +308,7 @@ void CMLan::OnRecvPacket(u_char* mes, int len, in_addr from) delete[] cont->m_nick; int nlen = (int)strlen(pak.strName); cont->m_nick = new char[nlen+1]; - CopyMemory(cont->m_nick, pak.strName, nlen+1); + memcpy(cont->m_nick, pak.strName, nlen+1); } } cont->m_time = MLAN_CHECK + MLAN_TIMEOUT; @@ -716,7 +716,7 @@ u_char* CMLan::CreatePacket(TPacket& pak, int* pBufLen) { *pb++ = 1+nameLen+1; *pb++ = MCODE_SND_NAME; - CopyMemory(pb, pak.strName, nameLen); + memcpy(pb, pak.strName, nameLen); pb += nameLen; *pb++ = 0; } @@ -739,7 +739,7 @@ u_char* CMLan::CreatePacket(TPacket& pak, int* pBufLen) *((u_int*)pb) = pak.idMessage; pb += sizeof(u_int); if (mesLen) - CopyMemory(pb, pak.strMessage, mesLen); + memcpy(pb, pak.strMessage, mesLen); pb += mesLen; *pb++ = 0; } @@ -772,7 +772,7 @@ u_char* CMLan::CreatePacket(TPacket& pak, int* pBufLen) *((u_int*)pb) = pak.idAckAwayMessage; pb += sizeof(u_int); if (awayLen) - CopyMemory(pb, pak.strAwayMessage, awayLen); + memcpy(pb, pak.strAwayMessage, awayLen); pb += awayLen; *pb++ = 0; } diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index 085cc2b898..2738f3e919 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -485,7 +485,7 @@ static void DoChatFormatting(TCHAR* pszText) } MoveMemory(p1 + mir_tstrlen(InsertThis), p1 + iRemoveChars, sizeof(TCHAR)*(mir_tstrlen(p1) - iRemoveChars + 1)); - CopyMemory(p1, InsertThis, sizeof(TCHAR)*mir_tstrlen(InsertThis)); + memcpy(p1, InsertThis, sizeof(TCHAR)*mir_tstrlen(InsertThis)); if (iRemoveChars || mir_tstrlen(InsertThis)) p1 += mir_tstrlen(InsertThis); else diff --git a/protocols/Tlen/src/tlen_presence.cpp b/protocols/Tlen/src/tlen_presence.cpp index 60a77916a2..7f45b4547e 100644 --- a/protocols/Tlen/src/tlen_presence.cpp +++ b/protocols/Tlen/src/tlen_presence.cpp @@ -283,7 +283,7 @@ static void TlenSendPresenceTo(TlenProtocol *proto, int status, char *to) else continue; if (strlen(substituteStr)>6) ptr=(char*)mir_realloc(ptr,strlen(ptr)+1+strlen(substituteStr)-6); MoveMemory(ptr+i+strlen(substituteStr),ptr+i+6,strlen(ptr)-i-5); - CopyMemory(ptr+i,substituteStr,strlen(substituteStr)); + memcpy(ptr+i,substituteStr,strlen(substituteStr)); } } } diff --git a/protocols/Xfire/src/Xfire_base.cpp b/protocols/Xfire/src/Xfire_base.cpp index dd924bcff3..6cf65879c9 100644 --- a/protocols/Xfire/src/Xfire_base.cpp +++ b/protocols/Xfire/src/Xfire_base.cpp @@ -541,7 +541,7 @@ HICON Xfire_base::createHICONfromdata(LPVOID data, unsigned int size) { if (buffer) { LPVOID data2 = GlobalLock(buffer); if (data2) { - CopyMemory(data2, data, size); + memcpy(data2, data, size); IStream* stream = NULL; if (CreateStreamOnHGlobal(data2, FALSE, &stream) == S_OK) @@ -571,7 +571,7 @@ HBITMAP Xfire_base::createHBITMAPfromdata(LPVOID data, unsigned int size) { if (buffer) { LPVOID data2 = GlobalLock(buffer); if (data2) { - CopyMemory(data2, data, size); + memcpy(data2, data, size); IStream* stream = NULL; if (CreateStreamOnHGlobal(data2, FALSE, &stream) == S_OK) -- cgit v1.2.3