CopyMemory -> memcpy

git-svn-id: http://svn.miranda-ng.org/main/trunk@11363 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 7 insertions, 7 deletions

diff --git a/src/core/stdaway/sendmsg.cpp b/src/core/stdaway/sendmsg.cpp
index 53273ab9a6..e9da826892 100644
--- a/src/core/stdaway/sendmsg.cpp
+++ b/src/core/stdaway/sendmsg.cpp
@@ -134,7 +134,7 @@ static TCHAR* GetAwayMessage(int statusMode, char *szProto)
 			if (mir_tstrlen(substituteStr) > 6)

 				dbv.ptszVal = (TCHAR*)mir_realloc(dbv.ptszVal, (mir_tstrlen(dbv.ptszVal) + 1 + mir_tstrlen(substituteStr) - 6) * sizeof(TCHAR));

 			MoveMemory(dbv.ptszVal + i + mir_tstrlen(substituteStr), dbv.ptszVal + i + 6, (mir_tstrlen(dbv.ptszVal) - i - 5) * sizeof(TCHAR));

-			CopyMemory(dbv.ptszVal+i, substituteStr, mir_tstrlen(substituteStr) * sizeof(TCHAR));

+			memcpy(dbv.ptszVal+i, substituteStr, mir_tstrlen(substituteStr) * sizeof(TCHAR));

 		}

 	}

 	return dbv.ptszVal;

diff --git a/src/core/stdchat/src/log.cpp b/src/core/stdchat/src/log.cpp
index 2ba54448ac..b247fb9029 100644
--- a/src/core/stdchat/src/log.cpp
+++ b/src/core/stdchat/src/log.cpp
@@ -36,7 +36,7 @@ static DWORD CALLBACK Log_StreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG
 

 		// give the RTF to the RE control

 		*pcb = min(cb, lstrdat->bufferLen - lstrdat->bufferOffset);

-		CopyMemory(pbBuff, lstrdat->buffer + lstrdat->bufferOffset, *pcb);

+		memcpy(pbBuff, lstrdat->buffer + lstrdat->bufferOffset, *pcb);

 		lstrdat->bufferOffset += *pcb;

 

 		// free stuff if the streaming operation is complete

diff --git a/src/core/stdfile/fileexistsdlg.cpp b/src/core/stdfile/fileexistsdlg.cpp
index bf44d2e70b..1c3e7dedef 100644
--- a/src/core/stdfile/fileexistsdlg.cpp
+++ b/src/core/stdfile/fileexistsdlg.cpp
@@ -63,7 +63,7 @@ static void DoAnnoyingShellCommand(HWND hwnd, const TCHAR *szFilename, int cmd,
 					pidlNext = (ITEMIDLIST*)((PBYTE)pidl + pidl->mkid.cb);

 					if (pidlNext->mkid.cb == 0) {

 						pidlFilename = (ITEMIDLIST*)CoTaskMemAlloc(pidl->mkid.cb + sizeof(pidl->mkid.cb));

-						CopyMemory(pidlFilename, pidl, pidl->mkid.cb + sizeof(pidl->mkid.cb));

+						memcpy(pidlFilename, pidl, pidl->mkid.cb + sizeof(pidl->mkid.cb));

 						pidl->mkid.cb = 0;

 						break;

 					}

@@ -312,7 +312,7 @@ INT_PTR CALLBACK DlgProcFileExists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			}

 

 			PROTOFILERESUME *pfrCopy = (PROTOFILERESUME*)mir_alloc(sizeof(pfr));

-			CopyMemory(pfrCopy, &pfr, sizeof(pfr));

+			memcpy(pfrCopy, &pfr, sizeof(pfr));

 			PostMessage((HWND)GetPropA(hwndDlg, "Miranda.ParentWnd"), M_FILEEXISTSDLGREPLY, (WPARAM)mir_tstrdup(fts->tszCurrentFile), (LPARAM)pfrCopy);

 			DestroyWindow(hwndDlg);

 		}

diff --git a/src/core/stdfile/filesenddlg.cpp b/src/core/stdfile/filesenddlg.cpp
index 9c98a4f108..5abc5221ff 100644
--- a/src/core/stdfile/filesenddlg.cpp
+++ b/src/core/stdfile/filesenddlg.cpp
@@ -109,7 +109,7 @@ static void FilenameToFileList(HWND hwndDlg, FileDlgData* dat, const TCHAR *buf)
 			dat->files[nTemp] = (TCHAR*)mir_alloc(sizeof(TCHAR)*(fileOffset + cbFileNameLen + 1));

 

 			// Add path to filename and copy into array

-			CopyMemory(dat->files[nTemp], buf, (fileOffset - 1)*sizeof(TCHAR));

+			memcpy(dat->files[nTemp], buf, (fileOffset - 1)*sizeof(TCHAR));

 			dat->files[nTemp][fileOffset - 1] = '\\';

 			_tcscpy(dat->files[nTemp] + fileOffset - (buf[fileOffset - 2] == '\\' ? 1 : 0), pBuf);

 

diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 647a067ba1..ef6c288bbf 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -280,7 +280,7 @@ static char *CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, HANDLE
 		while (bufferAlloced - bufferEnd < logIconBmpSize[i])

 			bufferAlloced += 1024;

 		buffer = (char *)mir_realloc(buffer, bufferAlloced);

-		CopyMemory(buffer + bufferEnd, pLogIconBmpBits[i], logIconBmpSize[i]);

+		memcpy(buffer + bufferEnd, pLogIconBmpBits[i], logIconBmpSize[i]);

 		bufferEnd += logIconBmpSize[i];

 	}

 

@@ -432,7 +432,7 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG
 		dat->bufferLen = (int)strlen(dat->buffer);

 	}

 	*pcb = min(cb, dat->bufferLen - dat->bufferOffset);

-	CopyMemory(pbBuff, dat->buffer + dat->bufferOffset, *pcb);

+	memcpy(pbBuff, dat->buffer + dat->bufferOffset, *pcb);

 	dat->bufferOffset += *pcb;

 	if (dat->bufferOffset == dat->bufferLen) {

 		mir_free(dat->buffer);