diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/chat/log.cpp | 8 | ||||
| -rw-r--r-- | src/modules/clist/contacts.cpp | 2 | ||||
| -rw-r--r-- | src/modules/findadd/findadd.cpp | 2 | ||||
| -rw-r--r-- | src/modules/netlib/netliblog.cpp | 6 | ||||
| -rw-r--r-- | src/modules/netlib/netlibssl.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
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;
|