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 --- plugins/Db3x_mmap/src/dbheaders.cpp | 2 +- plugins/Db3x_mmap/src/dbmodulechain.cpp | 2 +- plugins/Db3x_mmap/src/dbsettings.cpp | 4 ++-- plugins/Db3x_mmap/src/dbtool/disk.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Db3x_mmap/src') diff --git a/plugins/Db3x_mmap/src/dbheaders.cpp b/plugins/Db3x_mmap/src/dbheaders.cpp index 86a384e9eb..f8df60e84d 100644 --- a/plugins/Db3x_mmap/src/dbheaders.cpp +++ b/plugins/Db3x_mmap/src/dbheaders.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. int CDb3Mmap::CreateDbHeaders(const DBSignature& _sign) { - CopyMemory(m_dbHeader.signature, &_sign, sizeof(m_dbHeader.signature)); + memcpy(m_dbHeader.signature, &_sign, sizeof(m_dbHeader.signature)); m_dbHeader.version = DB_095_1_VERSION; m_dbHeader.ofsFileEnd = sizeof(struct DBHeader); diff --git a/plugins/Db3x_mmap/src/dbmodulechain.cpp b/plugins/Db3x_mmap/src/dbmodulechain.cpp index fbdb9d512a..603f55512b 100644 --- a/plugins/Db3x_mmap/src/dbmodulechain.cpp +++ b/plugins/Db3x_mmap/src/dbmodulechain.cpp @@ -49,7 +49,7 @@ int CDb3Mmap::InitModuleNames(void) int nameLen = dbmn->cbName; char *mod = (char*)HeapAlloc(m_hModHeap,0,nameLen+1); - CopyMemory(mod,DBRead(ofsThis + offsetof(struct DBModuleName,name),nameLen,NULL),nameLen); + memcpy(mod,DBRead(ofsThis + offsetof(struct DBModuleName,name),nameLen,NULL),nameLen); mod[nameLen] = 0; AddToList(mod, nameLen, ofsThis); diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp index fe6e12b592..1aff61284b 100644 --- a/plugins/Db3x_mmap/src/dbsettings.cpp +++ b/plugins/Db3x_mmap/src/dbsettings.cpp @@ -98,7 +98,7 @@ LBL_Seek: dbv->pszVal = cbOrigPtr; if (cbLen < cbOrigLen) cbOrigLen = cbLen; - CopyMemory(dbv->pszVal, pCachedValue->pszVal, cbOrigLen); + memcpy(dbv->pszVal, pCachedValue->pszVal, cbOrigLen); dbv->pszVal[cbOrigLen] = 0; dbv->cchVal = cbLen; } @@ -813,7 +813,7 @@ STDMETHODIMP_(BOOL) CDb3Mmap::EnumContactSettings(MCONTACT contactID, DBCONTACTE NeedBytes(1); NeedBytes(1 + pBlob[0]); char szSetting[256]; - CopyMemory(szSetting, pBlob + 1, pBlob[0]); szSetting[pBlob[0]] = 0; + memcpy(szSetting, pBlob + 1, pBlob[0]); szSetting[pBlob[0]] = 0; result = (dbces->pfnEnumProc)(szSetting, dbces->lParam); MoveAlong(1 + pBlob[0]); NeedBytes(3); diff --git a/plugins/Db3x_mmap/src/dbtool/disk.cpp b/plugins/Db3x_mmap/src/dbtool/disk.cpp index 109df7b03b..6299aa6184 100644 --- a/plugins/Db3x_mmap/src/dbtool/disk.cpp +++ b/plugins/Db3x_mmap/src/dbtool/disk.cpp @@ -48,7 +48,7 @@ int CDb3Mmap::PeekSegment(DWORD ofs, PVOID buf, int cbBytes) return ERROR_READ_FAULT; } - CopyMemory(buf, m_pDbCache + ofs, bytesRead); + memcpy(buf, m_pDbCache + ofs, bytesRead); if ((int)bytesRead