summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin10/lib/mir_core.libbin35798 -> 35798 bytes
-rw-r--r--bin10/lib/mir_core64.libbin32674 -> 32674 bytes
-rw-r--r--bin11/lib/mir_core.libbin35798 -> 35798 bytes
-rw-r--r--bin11/lib/mir_core64.libbin32674 -> 32674 bytes
-rw-r--r--include/delphi/m_core.inc4
-rw-r--r--include/m_core.h14
-rw-r--r--protocols/JabberG/src/jabber_chat.cpp2
-rw-r--r--protocols/JabberG/src/jabber_thread.cpp4
-rw-r--r--protocols/MSN/src/msn_chat.cpp2
-rw-r--r--protocols/MSN/src/msn_mail.cpp2
-rw-r--r--protocols/Xfire/src/Xfire_base.h30
-rw-r--r--src/mir_core/mir_core.def2
-rw-r--r--src/mir_core/utils.cpp2
-rw-r--r--src/modules/database/profilemanager.cpp4
-rw-r--r--src/modules/findadd/findadd.cpp6
15 files changed, 34 insertions, 38 deletions
diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib
index 1bed180db9..09817ec289 100644
--- a/bin10/lib/mir_core.lib
+++ b/bin10/lib/mir_core.lib
Binary files differ
diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib
index 5e34e2dd56..40b929ddee 100644
--- a/bin10/lib/mir_core64.lib
+++ b/bin10/lib/mir_core64.lib
Binary files differ
diff --git a/bin11/lib/mir_core.lib b/bin11/lib/mir_core.lib
index 299bac14d7..5a6813aaa9 100644
--- a/bin11/lib/mir_core.lib
+++ b/bin11/lib/mir_core.lib
Binary files differ
diff --git a/bin11/lib/mir_core64.lib b/bin11/lib/mir_core64.lib
index 42f1abbf5a..2a2ebb2b80 100644
--- a/bin11/lib/mir_core64.lib
+++ b/bin11/lib/mir_core64.lib
Binary files differ
diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index 5c550e109c..e462aeac27 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -555,8 +555,8 @@ procedure mir_sha1_hash(dataIn:pmir_sha1_byte_t; len:int;hashout:SHA1Hash); stdc
function rtrim(str:pAnsiChar):pAnsiChar; stdcall;
external CoreDLL name 'rtrim';
-function wrtrim(str:pWideChar):pWideChar; stdcall;
- external CoreDLL name 'wrtrim';
+function rtrimw(str:pWideChar):pWideChar; stdcall;
+ external CoreDLL name 'rtrimw';
// returns pointer to the beginning of string
function ltrim(str:pAnsiChar):pAnsiChar; stdcall;
diff --git a/include/m_core.h b/include/m_core.h
index 0b4fdf7ca6..e44ebee070 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -454,18 +454,12 @@ MIR_CORE_DLL(void) mir_sha1_hash(mir_sha1_byte_t *dataIn, int len, mir_sha1_byte
// strings
MIR_CORE_DLL(char*) rtrim(char *str);
-MIR_CORE_DLL(WCHAR*) wrtrim(WCHAR *str);
+MIR_CORE_DLL(WCHAR*) rtrimw(WCHAR *str);
-#ifdef _UNICODE
- #define trtrim wrtrim
-#else
- #define trtrim rtrim
-#endif
-
-MIR_CORE_DLL(char*) ltrim(char *str); // returns pointer to the beginning of string
+MIR_CORE_DLL(char*) ltrim(char *str); // returns pointer to the beginning of string
MIR_CORE_DLL(WCHAR*) ltrimw(WCHAR *str);
-MIR_CORE_DLL(char*) ltrimp(char *str); // returns pointer to the trimmed portion of string
+MIR_CORE_DLL(char*) ltrimp(char *str); // returns pointer to the trimmed portion of string
MIR_CORE_DLL(WCHAR*) ltrimpw(WCHAR *str);
MIR_CORE_DLL(int) wildcmp(const char *name, const char *mask);
@@ -503,6 +497,7 @@ __forceinline char* lrtrimp(char *str) { return ltrimp(rtrim(str)); };
#define mir_tstrndup mir_wstrndup
#define replaceStrT replaceStrW
+ #define rtrimt rtrimw
#define ltrimt ltrimw
#define ltrimpt ltrimpw
@@ -523,6 +518,7 @@ __forceinline char* lrtrimp(char *str) { return ltrimp(rtrim(str)); };
#define mir_tstrndup mir_strndup
#define replaceStrT replaceStr
+ #define rtrimt rtrim
#define ltrimt ltrim
#define ltrimpt ltrimp
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index c36c5dd748..1e423ad091 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -1510,7 +1510,7 @@ int CJabberProto::JabberGcEventHook(WPARAM, LPARAM lParam)
switch (gch->pDest->iType) {
case GC_USER_MESSAGE:
if (gch->pszText && lstrlen(gch->ptszText) > 0) {
- trtrim(gch->ptszText);
+ rtrimt(gch->ptszText);
if (m_bJabberOnline) {
TCHAR* buf = NEWTSTR_ALLOCA(gch->ptszText);
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 376dc3b7fc..a2a5745d28 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -296,7 +296,7 @@ LBL_Exit:
db_free(&dbv);
}
- if (*trtrim(info->username) == '\0') {
+ if (*rtrimt(info->username) == '\0') {
DWORD dwSize = SIZEOF(info->username);
if (GetUserName(info->username, &dwSize))
JSetStringT(NULL, "LoginName", info->username);
@@ -304,7 +304,7 @@ LBL_Exit:
info->username[0] = 0;
}
- if (*trtrim(info->username) == '\0') {
+ if (*rtrimt(info->username) == '\0') {
Log("Thread ended, login name is not configured");
JSendBroadcast(NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, NULL, LOGINERR_BADUSERID);
LBL_FatalError:
diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp
index fc738af20d..1c78c2af7d 100644
--- a/protocols/MSN/src/msn_chat.cpp
+++ b/protocols/MSN/src/msn_chat.cpp
@@ -345,7 +345,7 @@ int CMsnProto::MSN_GCEventHook(WPARAM, LPARAM lParam)
ThreadData* thread = MSN_GetThreadByChatId(gch->pDest->ptszID);
if (thread)
{
- trtrim(gch->ptszText); // remove the ending linebreak
+ rtrimt(gch->ptszText); // remove the ending linebreak
TCHAR* pszMsg = UnEscapeChatTags(NEWTSTR_ALLOCA(gch->ptszText));
thread->sendMessage('N', NULL, NETID_MSN, UTF8(pszMsg), 0);
diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index fa11d889eb..cbd45e8f92 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -413,7 +413,7 @@ void CMsnProto::displayEmailCount(HANDLE hContact)
}
while (ch && !_istdigit(ch[1]));
if (ch) *ch = 0;
- trtrim(name);
+ rtrimt(name);
TCHAR szNick[128];
mir_sntprintf(szNick, SIZEOF(szNick),
diff --git a/protocols/Xfire/src/Xfire_base.h b/protocols/Xfire/src/Xfire_base.h
index 248982b85f..451fa156d9 100644
--- a/protocols/Xfire/src/Xfire_base.h
+++ b/protocols/Xfire/src/Xfire_base.h
@@ -1,21 +1,21 @@
/*
* Plugin of miranda IM(ICQ) for Communicating with users of the XFire Network.
*
- * Copyright (C) 2010 by
- * dufte <dufte@justmail.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * Copyright (C) 2010 by
+ * dufte <dufte@justmail.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*
diff --git a/src/mir_core/mir_core.def b/src/mir_core/mir_core.def
index c436496a31..44ad59c86a 100644
--- a/src/mir_core/mir_core.def
+++ b/src/mir_core/mir_core.def
@@ -103,7 +103,7 @@ mir_vsntprintf @100
mir_wstrdup @101
rtrim @102
wildcmp @103
-wrtrim @104
+rtrimw @104
mir_snprintf @105
mir_sntprintf @106
db_unset @107
diff --git a/src/mir_core/utils.cpp b/src/mir_core/utils.cpp
index a98444d5da..21c9e8dfd5 100644
--- a/src/mir_core/utils.cpp
+++ b/src/mir_core/utils.cpp
@@ -56,7 +56,7 @@ MIR_CORE_DLL(char*) rtrim(char* str)
return str;
}
-MIR_CORE_DLL(WCHAR*) wrtrim(WCHAR *str)
+MIR_CORE_DLL(WCHAR*) rtrimw(WCHAR *str)
{
if (str == NULL)
return NULL;
diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp
index 67589a9d25..267fcde3f3 100644
--- a/src/modules/database/profilemanager.cpp
+++ b/src/modules/database/profilemanager.cpp
@@ -318,11 +318,11 @@ BOOL EnumProfilesForList(TCHAR *fullpath, TCHAR *profile, LPARAM lParam)
}
item2.iSubItem = 3;
- item2.pszText = trtrim(_tctime(&statbuf.st_ctime));
+ item2.pszText = rtrimt(_tctime(&statbuf.st_ctime));
SendMessage(hwndList, LVM_SETITEMTEXT, iItem, (LPARAM)&item2);
item2.iSubItem = 4;
- item2.pszText = trtrim(_tctime(&statbuf.st_mtime));
+ item2.pszText = rtrimt(_tctime(&statbuf.st_mtime));
SendMessage(hwndList, LVM_SETITEMTEXT, iItem, (LPARAM)&item2);
}
return TRUE;
diff --git a/src/modules/findadd/findadd.cpp b/src/modules/findadd/findadd.cpp
index 9bbc8ddcff..1228083026 100644
--- a/src/modules/findadd/findadd.cpp
+++ b/src/modules/findadd/findadd.cpp
@@ -687,7 +687,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
else if (IsDlgButtonChecked(hwndDlg, IDC_BYPROTOID)) {
TCHAR str[256];
GetDlgItemText(hwndDlg, IDC_PROTOID, str, SIZEOF(str));
- trtrim(str);
+ rtrimt(str);
if (str[0] == 0)
MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_OK);
else
@@ -696,7 +696,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
else if (IsDlgButtonChecked(hwndDlg, IDC_BYEMAIL)) {
TCHAR str[256];
GetDlgItemText(hwndDlg, IDC_EMAIL, str, SIZEOF(str));
- trtrim(str);
+ rtrimt(str);
if (str[0] == 0)
MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_OK);
else
@@ -755,7 +755,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
else {
TCHAR str[256];
GetDlgItemText(hwndDlg, IDC_PROTOID, str, SIZEOF(str));
- if (*trtrim(str) == 0)
+ if (*rtrimt(str) == 0)
break;
PROTOSEARCHRESULT psr = {0};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 03:46:32 +0000