diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdauth/src/authdialogs.cpp | 14 | ||||
| -rw-r--r-- | src/core/stdcrypt/src/Rijndael.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdcrypt/src/encrypt.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdfile/src/filerecvdlg.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msglog.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdurl/urldialogs.cpp | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/core/stdauth/src/authdialogs.cpp b/src/core/stdauth/src/authdialogs.cpp index 4c8c66ce5d..d1b1e3833d 100644 --- a/src/core/stdauth/src/authdialogs.cpp +++ b/src/core/stdauth/src/authdialogs.cpp @@ -46,9 +46,9 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar DWORD uin = *(PDWORD)dbei.pBlob;
MCONTACT hContact = DbGetAuthEventContact(&dbei);
char* nick = (char*)dbei.pBlob + sizeof(DWORD) * 2;
- char* first = nick + strlen(nick) + 1;
- char* last = first + strlen(first) + 1;
- char* email = last + strlen(last) + 1;
+ char* first = nick + mir_strlen(nick) + 1;
+ char* last = first + mir_strlen(first) + 1;
+ char* email = last + mir_strlen(last) + 1;
SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0));
SendMessage(hwndDlg, WM_SETICON, ICON_BIG, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_LARGE, 0));
@@ -169,10 +169,10 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DWORD uin = *(PDWORD)dbei.pBlob;
MCONTACT hContact = DbGetAuthEventContact(&dbei);
char *nick = (char*)dbei.pBlob + sizeof(DWORD) * 2;
- char *first = nick + strlen(nick) + 1;
- char *last = first + strlen(first) + 1;
- char *email = last + strlen(last) + 1;
- char *reason = email + strlen(email) + 1;
+ char *first = nick + mir_strlen(nick) + 1;
+ char *last = first + mir_strlen(first) + 1;
+ char *email = last + mir_strlen(last) + 1;
+ char *reason = email + mir_strlen(email) + 1;
SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0));
SendMessage(hwndDlg, WM_SETICON, ICON_BIG, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_LARGE, 0));
diff --git a/src/core/stdcrypt/src/Rijndael.cpp b/src/core/stdcrypt/src/Rijndael.cpp index 95cc317099..e721c3e36d 100644 --- a/src/core/stdcrypt/src/Rijndael.cpp +++ b/src/core/stdcrypt/src/Rijndael.cpp @@ -963,7 +963,7 @@ int CRijndael::MakeKey(BYTE const* key, char const* chain, int keylength, int bl m_keylength = keylength;
m_blockSize = blockSize;
//Initialize the chain
- size_t len = strlen(chain);
+ size_t len = mir_strlen(chain);
if (len >= m_blockSize)
memcpy(m_chain0, chain, m_blockSize);
else {
diff --git a/src/core/stdcrypt/src/encrypt.cpp b/src/core/stdcrypt/src/encrypt.cpp index e2b3281bcc..7c997e9825 100644 --- a/src/core/stdcrypt/src/encrypt.cpp +++ b/src/core/stdcrypt/src/encrypt.cpp @@ -125,7 +125,7 @@ BYTE* CStdCrypt::encodeString(const char *src, size_t *cbResultLen) return NULL;
}
- return encodeBuffer(src, strlen(src)+1, cbResultLen);
+ return encodeBuffer(src, mir_strlen(src)+1, cbResultLen);
}
BYTE* CStdCrypt::encodeBuffer(const void *src, size_t cbLen, size_t *cbResultLen)
diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp index f28660dea0..ccfaa427e2 100644 --- a/src/core/stdfile/src/filerecvdlg.cpp +++ b/src/core/stdfile/src/filerecvdlg.cpp @@ -244,7 +244,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l ptrT ptszFileName(DbGetEventStringT(&dbei, str));
SetDlgItemText(hwndDlg, IDC_FILENAMES, ptszFileName);
- unsigned len = (unsigned)strlen(str) + 1;
+ unsigned len = (unsigned)mir_strlen(str) + 1;
if (len + 4 < dbei.cbBlob) {
str += len;
ptrT ptszDescription(DbGetEventStringT(&dbei, str));
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index 9a458701f0..aa8cf996f3 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -112,7 +112,7 @@ static int AppendToBufferWithRTF(char *&buffer, size_t &cbBufferEnd, size_t &cbB if (line[1] == bbcodes[i][1]) {
size_t lenb = _tcslen(bbcodes[i]);
if (!_tcsnicmp(line, bbcodes[i], lenb)) {
- size_t len = strlen(bbcodefmt[i]);
+ size_t len = mir_strlen(bbcodefmt[i]);
memcpy(d, bbcodefmt[i], len);
d += len;
line += lenb - 1;
@@ -362,7 +362,7 @@ static char *CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, MEVENT case EVENTTYPE_FILE:
{
char* filename = (char*)dbei.pBlob + sizeof(DWORD);
- char* descr = filename + strlen(filename) + 1;
+ char* descr = filename + mir_strlen(filename) + 1;
ptrT ptszFileName(DbGetEventStringT(&dbei, filename));
AppendToBuffer(buffer, bufferEnd, bufferAlloced, " %s ", SetToStyle(MSGFONTID_NOTICE));
diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp index 96bef0f424..d681aa2bde 100644 --- a/src/core/stdurl/urldialogs.cpp +++ b/src/core/stdurl/urldialogs.cpp @@ -626,7 +626,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dbei.flags = DBEF_SENT;
dbei.szModule = GetContactProto(dat->hContact);
dbei.timestamp = time(NULL);
- dbei.cbBlob = (DWORD)(strlen(dat->sendBuffer)+strlen(dat->sendBuffer+strlen(dat->sendBuffer)+1)+2);
+ dbei.cbBlob = (DWORD)(mir_strlen(dat->sendBuffer)+mir_strlen(dat->sendBuffer+mir_strlen(dat->sendBuffer)+1)+2);
dbei.pBlob = (PBYTE)dat->sendBuffer;
db_event_add(dat->hContact, &dbei);
KillTimer(hwndDlg, 0);
|