4 files changed, 9 insertions, 9 deletions

diff --git a/plugins/Scriver/src/chat/log.cpp b/plugins/Scriver/src/chat/log.cpp
index 3a616bff6e..e58c506e78 100644
--- a/plugins/Scriver/src/chat/log.cpp
+++ b/plugins/Scriver/src/chat/log.cpp
@@ -38,7 +38,7 @@ static DWORD CALLBACK Log_StreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG
 

 		// give the RTF to the RE control

 		*pcb = min(cb, LONG(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/plugins/Scriver/src/chat/message.cpp b/plugins/Scriver/src/chat/message.cpp
index fa228ab895..c01cb1f2ee 100644
--- a/plugins/Scriver/src/chat/message.cpp
+++ b/plugins/Scriver/src/chat/message.cpp
@@ -288,7 +288,7 @@ TCHAR* DoRtfToTags(char *pszText, SESSION_INFO *si)
 		// move the memory and paste in new commands instead of the old RTF

 		if (InsertThis[0] || iRemoveChars) {

 			MoveMemory(p1 + mir_strlen(InsertThis), p1 + iRemoveChars, mir_strlen(p1) - iRemoveChars + 1);

-			CopyMemory(p1, InsertThis, mir_strlen(InsertThis));

+			memcpy(p1, InsertThis, mir_strlen(InsertThis));

 			p1 += mir_strlen(InsertThis);

 		}

 		else p1++;

diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp
index bfbacffcf0..04cfeacc0d 100644
--- a/plugins/Scriver/src/input.cpp
+++ b/plugins/Scriver/src/input.cpp
@@ -385,7 +385,7 @@ BOOL HandleLinkClick(HINSTANCE hInstance, HWND hwndDlg, HWND hwndFocus, ENLINK *
 	SendMessage(lParam->nmhdr.hwndFrom, EM_GETTEXTRANGE, 0, (LPARAM)&tr);

 	if (_tcschr(tr.lpstrText, _T('@')) != NULL && _tcschr(tr.lpstrText, _T(':')) == NULL && _tcschr(tr.lpstrText, _T('/')) == NULL) {

 		MoveMemory(tr.lpstrText + 7, tr.lpstrText, sizeof(TCHAR)*(tr.chrg.cpMax - tr.chrg.cpMin + 1));

-		CopyMemory(tr.lpstrText, _T("mailto:"), sizeof(TCHAR) * 7);

+		memcpy(tr.lpstrText, _T("mailto:"), sizeof(TCHAR) * 7);

 	}

 

 	BOOL bOpenLink = TRUE;

diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp
index 21579c6c68..333e373db4 100644
--- a/plugins/Scriver/src/msglog.cpp
+++ b/plugins/Scriver/src/msglog.cpp
@@ -277,18 +277,18 @@ static int AppendUnicodeOrAnsiiToBufferL(char *&buffer, size_t &cbBufferEnd, siz
 	for (; line < maxLine; line++, textCharsCount++) {

 		wasEOL = 0;

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

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

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

 			wasEOL = 1;

 			d += 6;

 			line++;

 		}

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

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

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

 			wasEOL = 1;

 			d += 6;

 		}

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

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

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

 			d += 5;

 		}

 		else if (*line == '\\' || *line == '{' || *line == '}') {

@@ -306,7 +306,7 @@ static int AppendUnicodeOrAnsiiToBufferL(char *&buffer, size_t &cbBufferEnd, siz
 		}

 	}

 	if (wasEOL) {

-		CopyMemory(d, " ", 1);

+		memcpy(d, " ", 1);

 		d++;

 	}

 	strcpy(d, "}");

@@ -618,7 +618,7 @@ static char* CreateRTFFromEvent(SrmmWindowData *dat, EventData *evt, GlobalMessa
 		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];

 		AppendToBuffer(buffer, bufferEnd, bufferAlloced, " ");

 	}

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

 	}

 	*pcb = min(cb, LONG(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);