summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2015-05-22 10:24:40 +0000
committerKirill Volinsky <mataes2007@gmail.com>2015-05-22 10:24:40 +0000
commita371c34e0720a4d41a81da6b0cede16c5cf8779d (patch)
tree88da0eeb2955d8e20618be4a57de43c08e9888b9
parentb499ebc740aa5480be013d40e0d8097066800642 (diff)
replace lstrlen to mir_tstrlen
git-svn-id: http://svn.miranda-ng.org/main/trunk@13749 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/ShellExt/src/main.cpp2
-rw-r--r--protocols/ICQCorp/src/protocol.cpp6
-rw-r--r--protocols/ICQCorp/src/services.cpp6
-rw-r--r--protocols/JabberG/src/obsoleted/jabber_form2.cpp2
-rw-r--r--protocols/Steam/src/Junk/steam_thread.cpp2
5 files changed, 9 insertions, 9 deletions
diff --git a/plugins/ShellExt/src/main.cpp b/plugins/ShellExt/src/main.cpp
index 12a09506a4..93d0a09d03 100644
--- a/plugins/ShellExt/src/main.cpp
+++ b/plugins/ShellExt/src/main.cpp
@@ -128,7 +128,7 @@ STDAPI DllRegisterServer()
TCHAR tszFileName[MAX_PATH];
GetModuleFileName(hInst, tszFileName, SIZEOF(tszFileName));
- if ( RegSetValueEx(kInprocServer, NULL, 0, REG_SZ, (LPBYTE)tszFileName, sizeof(TCHAR)*(lstrlen(tszFileName)+1)))
+ if ( RegSetValueEx(kInprocServer, NULL, 0, REG_SZ, (LPBYTE)tszFileName, sizeof(TCHAR)*(mir_tstrlen(tszFileName)+1)))
return E_FAIL;
if ( RegSetValueExA(kInprocServer, "ThreadingModel", 0, REG_SZ, (PBYTE)str4, sizeof(str4)))
return E_FAIL;
diff --git a/protocols/ICQCorp/src/protocol.cpp b/protocols/ICQCorp/src/protocol.cpp
index 439add0b1e..29fcebed90 100644
--- a/protocols/ICQCorp/src/protocol.cpp
+++ b/protocols/ICQCorp/src/protocol.cpp
@@ -2207,12 +2207,12 @@ void ICQ::addUrl(ICQUser *u, char *m, unsigned short theCmd, unsigned short theS
CCSDATA ccs;
PROTORECVEVENT pre;
- messageLen = lstrlen(m);
+ messageLen = mir_tstrlen(m);
for (i=0; i<messageLen; i++) if (m[i] == (char)0xFE) m[i] = 0;
url = new char[messageLen + 1];
- lstrcpy(url, m + lstrlen(m) + 1);
- lstrcpy(url + lstrlen(url) + 1, m);
+ lstrcpy(url, m + mir_tstrlen(m) + 1);
+ lstrcpy(url + mir_tstrlen(url) + 1, m);
ccs.hContact = u->hContact;
ccs.szProtoService = PSR_URL;
diff --git a/protocols/ICQCorp/src/services.cpp b/protocols/ICQCorp/src/services.cpp
index 20796a0efb..fcc37c8dbd 100644
--- a/protocols/ICQCorp/src/services.cpp
+++ b/protocols/ICQCorp/src/services.cpp
@@ -217,7 +217,7 @@ static INT_PTR icqRecvMessage(WPARAM wParam, LPARAM lParam)
dbei.timestamp = pre->timestamp;
dbei.flags = pre->flags & (PREF_CREATEREAD ? DBEF_READ : 0);
dbei.eventType = EVENTTYPE_MESSAGE;
- dbei.cbBlob = lstrlen(pre->szMessage) + 1;
+ dbei.cbBlob = mir_tstrlen(pre->szMessage) + 1;
dbei.pBlob = (PBYTE)pre->szMessage;
db_event_add(ccs->hContact, &dbei);
return 0;
@@ -253,14 +253,14 @@ static INT_PTR icqRecvUrl(WPARAM wParam, LPARAM lParam)
T("[ ] recieve url\n");
db_unset(ccs->hContact, "CList", "Hidden");
- pszDescr = pre->szMessage + lstrlen(pre->szMessage) + 1;
+ pszDescr = pre->szMessage + mir_tstrlen(pre->szMessage) + 1;
ZeroMemory(&dbei, sizeof(dbei));
dbei.cbSize = sizeof(dbei);
dbei.szModule = protoName;
dbei.timestamp = pre->timestamp;
dbei.flags = pre->flags & (PREF_CREATEREAD ? DBEF_READ : 0);
dbei.eventType = EVENTTYPE_URL;
- dbei.cbBlob = lstrlen(pre->szMessage) + lstrlen(pszDescr) + 2;
+ dbei.cbBlob = mir_tstrlen(pre->szMessage) + mir_tstrlen(pszDescr) + 2;
dbei.pBlob = (PBYTE)pre->szMessage;
db_event_add(ccs->hContact, &dbei);
return 0;
diff --git a/protocols/JabberG/src/obsoleted/jabber_form2.cpp b/protocols/JabberG/src/obsoleted/jabber_form2.cpp
index bd8fa20425..02400de029 100644
--- a/protocols/JabberG/src/obsoleted/jabber_form2.cpp
+++ b/protocols/JabberG/src/obsoleted/jabber_form2.cpp
@@ -777,7 +777,7 @@ public:
CreateLabel();
int i, length = 1;
for (i = 0; i < m_field->GetValueCount(); ++i)
- length += lstrlen(m_field->GetValue(i)) + 2;
+ length += mir_tstrlen(m_field->GetValue(i)) + 2;
TCHAR *str = (TCHAR *)mir_alloc(sizeof(TCHAR) * length);
*str = 0;
diff --git a/protocols/Steam/src/Junk/steam_thread.cpp b/protocols/Steam/src/Junk/steam_thread.cpp
index 98915f87cd..f07541c6d3 100644
--- a/protocols/Steam/src/Junk/steam_thread.cpp
+++ b/protocols/Steam/src/Junk/steam_thread.cpp
@@ -45,7 +45,7 @@ void CSteamProto::PollServer(const char *token, const char *umqId, UINT32 messag
{
const wchar_t *text = message->GetText();
- AddDBEvent(hContact, EVENTTYPE_MESSAGE, time(NULL), DBEF_UTF | DBEF_SENT, lstrlen(text), (BYTE*)mir_utf8encodeW(text));
+ AddDBEvent(hContact, EVENTTYPE_MESSAGE, time(NULL), DBEF_UTF | DBEF_SENT, mir_tstrlen(text), (BYTE*)mir_utf8encodeW(text));
}
}
break;