CopyMemory -> memcpy

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

10 files changed, 17 insertions, 17 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);

diff --git a/src/modules/chat/log.cpp b/src/modules/chat/log.cpp
index 967de076de..44b0ac9248 100644
--- a/src/modules/chat/log.cpp
+++ b/src/modules/chat/log.cpp
@@ -126,12 +126,12 @@ static int Log_AppendRTF(LOGSTREAMDATA *streamData, BOOL simpleMode, char *&buff
 

 	for (; *line; line++, textCharsCount++) {

 		if (*line == '\r' && line[1] == '\n') {

-			CopyMemory(d, "\\par ", 5);

+			memcpy(d, "\\par ", 5);

 			line++;

 			d += 5;

 		}

 		else if (*line == '\n') {

-			CopyMemory(d, "\\line ", 6);

+			memcpy(d, "\\line ", 6);

 			d += 6;

 		}

 		else if (*line == '%' && !simpleMode) {

@@ -203,7 +203,7 @@ static int Log_AppendRTF(LOGSTREAMDATA *streamData, BOOL simpleMode, char *&buff
 			}

 		}

 		else if (*line == '\t' && !streamData->bStripFormat) {

-			CopyMemory(d, "\\tab ", 5);

+			memcpy(d, "\\tab ", 5);

 			d += 5;

 		}

 		else if ((*line == '\\' || *line == '{' || *line == '}') && !streamData->bStripFormat) {

@@ -353,7 +353,7 @@ char* Log_CreateRTF(LOGSTREAMDATA *streamData)
 			while (bufferAlloced - bufferEnd < logIconBmpSize[0])

 				bufferAlloced += 4096;

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

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

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

 			bufferEnd += logIconBmpSize[iIndex];

 		}

 

diff --git a/src/modules/clist/contacts.cpp b/src/modules/clist/contacts.cpp
index b07aa7e921..4ebe10d121 100644
--- a/src/modules/clist/contacts.cpp
+++ b/src/modules/clist/contacts.cpp
@@ -516,7 +516,7 @@ int LoadContactsModule(void)
 

 	DBVARIANT dbv;

 	if (!db_get(NULL, "Contact", "NameOrder", &dbv)) {

-		CopyMemory(nameOrder, dbv.pbVal, dbv.cpbVal);

+		memcpy(nameOrder, dbv.pbVal, dbv.cpbVal);

 		db_free(&dbv);

 	}

 

diff --git a/src/modules/findadd/findadd.cpp b/src/modules/findadd/findadd.cpp
index 67d0c46d9d..ef08f042be 100644
--- a/src/modules/findadd/findadd.cpp
+++ b/src/modules/findadd/findadd.cpp
@@ -919,7 +919,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 
 				dat->bFlexSearchResult = FALSE;
 
-				CopyMemory(&lsr->psr, psr, psr->cbSize);
+				memcpy(&lsr->psr, psr, psr->cbSize);
 				lsr->psr.nick = psr->flags & PSR_UNICODE ? mir_u2t((wchar_t*)psr->nick) : mir_a2t((char*)psr->nick);
 				lsr->psr.firstName = psr->flags & PSR_UNICODE ? mir_u2t((wchar_t*)psr->firstName) : mir_a2t((char*)psr->firstName);
 				lsr->psr.lastName = psr->flags & PSR_UNICODE ? mir_u2t((wchar_t*)psr->lastName) : mir_a2t((char*)psr->lastName);
diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp
index 90c77aafe1..5f18385f14 100644
--- a/src/modules/netlib/netliblog.cpp
+++ b/src/modules/netlib/netliblog.cpp
@@ -437,8 +437,8 @@ void NetlibDumpData(NetlibConnection *nlc, PBYTE buf, int len, int sent, int fla
 		int sz = titleLineLen + len + 1;

 		useStack = sz <= 8192;

 		szBuf = (char*)(useStack ? alloca(sz) : mir_alloc(sz));

-		CopyMemory(szBuf, szTitleLine, titleLineLen);

-		CopyMemory(szBuf + titleLineLen, (const char*)buf, len);

+		memcpy(szBuf, szTitleLine, titleLineLen);

+		memcpy(szBuf + titleLineLen, (const char*)buf, len);

 		szBuf[titleLineLen + len] = '\0';

 	}

 	// Binary data

@@ -448,7 +448,7 @@ void NetlibDumpData(NetlibConnection *nlc, PBYTE buf, int len, int sent, int fla
 		useStack = sz <= 8192;

 

 		szBuf = (char*)(useStack ? alloca(sz) : mir_alloc(sz));

-		CopyMemory(szBuf, szTitleLine, titleLineLen);

+		memcpy(szBuf, szTitleLine, titleLineLen);

 		char *pszBuf = szBuf + titleLineLen;

 		for (line = 0;; line += 16) {

 			colsInLine = min(16, len - line);

diff --git a/src/modules/netlib/netlibssl.cpp b/src/modules/netlib/netlibssl.cpp
index 456670ae8f..fa9a77028d 100644
--- a/src/modules/netlib/netlibssl.cpp
+++ b/src/modules/netlib/netlibssl.cpp
@@ -896,7 +896,7 @@ int NetlibSslWrite(SslHandle *ssl, const char *buf, int num)
 	while (sendOff < (DWORD)num)

 	{

 		cbMessage = min(Sizes.cbMaximumMessage, (DWORD)num - sendOff);

-		CopyMemory(pbMessage, buf+sendOff, cbMessage);

+		memcpy(pbMessage, buf+sendOff, cbMessage);

 

 		Buffers[0].pvBuffer = pbDataBuffer;

 		Buffers[0].cbBuffer = Sizes.cbHeader;