diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 12:33:13 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 12:33:13 +0000 |
| commit | 159b565b390687258ee65a3b66596e118752063c (patch) | |
| tree | 91105378fcb9e030ba4a7f6572c4ea307cb8c8d6 /plugins | |
| parent | 7f4d529b59698d7eb2403bd1f9088a5aa7fa9080 (diff) | |
replace strcmp to mir_strcmp
git-svn-id: http://svn.miranda-ng.org/main/trunk@13752 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
159 files changed, 409 insertions, 409 deletions
diff --git a/plugins/AVS/src/acc.cpp b/plugins/AVS/src/acc.cpp index 256f92936d..b58e9922f0 100644 --- a/plugins/AVS/src/acc.cpp +++ b/plugins/AVS/src/acc.cpp @@ -432,7 +432,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP case AVATAR_SETPROTOCOL:
szProto = (lParam == NULL) ? "" : (char*)lParam;
- if (data->hContact != 0 || strcmp(szProto, data->proto)) {
+ if (data->hContact != 0 || mir_strcmp(szProto, data->proto)) {
DestroyAnimation(data);
data->hContact = NULL;
@@ -540,7 +540,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP break;
case DM_MYAVATARCHANGED:
- if (data->hContact == NULL && strcmp(data->proto, (char*)wParam) == 0) {
+ if (data->hContact == NULL && mir_strcmp(data->proto, (char*)wParam) == 0) {
DestroyAnimation(data);
StartAnimation(data);
diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 1c33df43ae..247872ac8c 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -202,7 +202,7 @@ static int ContactSettingChanged(WPARAM hContact, LPARAM lParam) return 0;
if (hContact == 0)
- if (!strcmp(cws->szSetting, "AvatarFile") || !strcmp(cws->szSetting, "PictObject") || !strcmp(cws->szSetting, "AvatarHash") || !strcmp(cws->szSetting, "AvatarSaved"))
+ if (!mir_strcmp(cws->szSetting, "AvatarFile") || !mir_strcmp(cws->szSetting, "PictObject") || !mir_strcmp(cws->szSetting, "AvatarHash") || !mir_strcmp(cws->szSetting, "AvatarSaved"))
ReportMyAvatarChanged((WPARAM)cws->szModule, 0);
return 0;
diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index 19f2068aaa..a0c3d1a6b3 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -164,7 +164,7 @@ static void SetProtoPic(char *szProto) if (mir_strlen(p.szProtoname) == 0) break; - if (!strcmp(p.szProtoname, szProto) && mir_strlen(p.szProtoname) == mir_strlen(szProto)) { + if (!mir_strcmp(p.szProtoname, szProto) && mir_strlen(p.szProtoname) == mir_strlen(szProto)) { if (p.hbmPic != 0) DeleteObject(p.hbmPic); memset(&p, 0, sizeof(avatarCacheEntry)); diff --git a/plugins/AVS/src/poll.cpp b/plugins/AVS/src/poll.cpp index 4b4c5511e3..4911fb0e41 100644 --- a/plugins/AVS/src/poll.cpp +++ b/plugins/AVS/src/poll.cpp @@ -81,7 +81,7 @@ static BOOL PollProtocolCanHaveAvatar(const char *szProto) {
int pCaps = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0);
int status = CallProtoService(szProto, PS_GETSTATUS, 0, 0);
- return (pCaps & PF4_AVATARS) && strcmp(META_PROTO, szProto) &&
+ return (pCaps & PF4_AVATARS) && mir_strcmp(META_PROTO, szProto) &&
((status > ID_STATUS_OFFLINE && status != ID_STATUS_INVISIBLE) || Proto_IsFetchingWhenProtoNotVisibleAllowed(szProto));
}
diff --git a/plugins/AddContactPlus/src/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp index 7e79830a37..97a255cd99 100644 --- a/plugins/AddContactPlus/src/addcontact.cpp +++ b/plugins/AddContactPlus/src/addcontact.cpp @@ -133,7 +133,7 @@ bool AddContactDlgAccounts(HWND hdlg, AddDialogParam *acs) DestroyIcon(hIcon);
cbei.lParam = (LPARAM)pAccounts[i]->szModuleName;
SendDlgItemMessage(hdlg, IDC_PROTO, CBEM_INSERTITEM, 0, (LPARAM)&cbei);
- if (cbei.lParam && !strcmp(acs->proto, pAccounts[i]->szModuleName))
+ if (cbei.lParam && !mir_strcmp(acs->proto, pAccounts[i]->szModuleName))
iIndex = cbei.iItem;
cbei.iItem++;
}
diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp index 50df90a8dd..1cb5702829 100644 --- a/plugins/AvatarHistory/src/AvatarHistory.cpp +++ b/plugins/AvatarHistory/src/AvatarHistory.cpp @@ -111,7 +111,7 @@ static int AvatarChanged(WPARAM hContact, LPARAM lParam) if (proto == NULL)
return 0;
- if (strcmp(META_PROTO, proto) == 0)
+ if (mir_strcmp(META_PROTO, proto) == 0)
return 0;
DBVARIANT dbvOldHash = {0};
diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 702ca65e73..05cb137467 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -572,8 +572,8 @@ int OnSettingChanged(WPARAM wParam, LPARAM lParam) return 0;
DBCONTACTWRITESETTING *dbcws = (DBCONTACTWRITESETTING*)lParam;
- if (!strcmp(dbcws->szModule, "Skin")) {
- if (!strcmp(dbcws->szSetting, "UseSound")) {
+ if (!mir_strcmp(dbcws->szModule, "Skin")) {
+ if (!mir_strcmp(dbcws->szSetting, "UseSound")) {
EnableFrameIcon(dbcws->value.bVal != 0);
return 0;
}
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index 20f798a081..97e20e9dc8 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -589,7 +589,7 @@ static int TabsrmmButtonPressed(WPARAM, LPARAM lParam) {
CustomButtonClickData *cbcd = (CustomButtonClickData *)lParam;
- if (!strcmp(cbcd->pszModule, MOD_NAME))
+ if (!mir_strcmp(cbcd->pszModule, MOD_NAME))
BossKeyHideMiranda(0, 0);
return 0;
diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index 1e5af0dac8..f9f9a45d0a 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -467,7 +467,7 @@ int onExtraImageApplying(WPARAM hContact, LPARAM) int SettingChanged(WPARAM hContact, LPARAM lParam)
{
DBCONTACTWRITESETTING *inf = (DBCONTACTWRITESETTING*)lParam;
- if (hContact == NULL || inf->value.type == DBVT_DELETED || strcmp(inf->szSetting, "Status") != 0)
+ if (hContact == NULL || inf->value.type == DBVT_DELETED || mir_strcmp(inf->szSetting, "Status") != 0)
return 0;
if (db_get_b(hContact, "CList", "NotOnList", 0) == 1)
diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index 7f6d1a9c9a..b7fe00b559 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -155,7 +155,7 @@ int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam) DBCONTACTWRITESETTING *cws=(DBCONTACTWRITESETTING*)lParam;
char *szProto = GetContactProto(hContact);
- if(hContact == NULL || strcmp(cws->szSetting,"Status")) return 0;
+ if(hContact == NULL || mir_strcmp(cws->szSetting,"Status")) return 0;
if (szProto && (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM)) {
int newStatus = cws->value.wVal;
int oldStatus = db_get_w(hContact,"UserOnline","OldStatus",ID_STATUS_OFFLINE);
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index d82121c760..0b49d38101 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -212,7 +212,7 @@ INT_PTR showList(WPARAM, LPARAM, LPARAM param) char* szProto = (char*)param; for (int i = 0; i < arWindows.getCount(); i++) { CSWindow *p = arWindows[i]; - if (!strcmp(szProto, p->m_protoName)) { + if (!mir_strcmp(szProto, p->m_protoName)) { ShowWindow(p->m_handle, SW_SHOW); SetForegroundWindow(p->m_handle); return 1; diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index 46111ef053..4e2a5c4648 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -194,7 +194,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) return 0;
_ASSERT(szProto);
- if (!strcmp(szProto, META_PROTO)) // workaround for metacontacts
+ if (!mir_strcmp(szProto, META_PROTO)) // workaround for metacontacts
return 0;
sd.MirVer = db_get_s(hContact, szProto, DB_MIRVER, _T(""));
diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp index d30498139e..5634ab1cc1 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp @@ -151,7 +151,7 @@ INT_PTR GroupMenuExecService(WPARAM wParam, LPARAM lParam) {
if (wParam != 0) {
lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)wParam;
- if (!strcmp(mmep->szServiceName, "Help/AboutCommand")) {
+ if (!mir_strcmp(mmep->szServiceName, "Help/AboutCommand")) {
//bug in help.c,it used wparam as parent window handle without reason.
mmep->Param1 = 0;
CallService(mmep->szServiceName, mmep->Param1, lParam);
@@ -474,7 +474,7 @@ INT_PTR SubGroupMenuonAddService(WPARAM wParam, LPARAM) INT_PTR SubGroupMenuExecService(WPARAM wParam, LPARAM lParam) {
if (wParam!=0) {
lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)wParam;
- if (!strcmp(mmep->szServiceName, "Help/AboutCommand")) {
+ if (!mir_strcmp(mmep->szServiceName, "Help/AboutCommand")) {
//bug in help.c,it used wparam as parent window handle without reason.
mmep->Param1 = 0;
CallService(mmep->szServiceName, mmep->Param1, lParam);
diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index 834ac2422a..d85939a0a0 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -111,7 +111,7 @@ int AddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hContact) p->xStatus = cfg::getByte(hContact, p->proto, "XStatusId", 0);
if (p->proto)
- p->bIsMeta = !strcmp(p->proto, META_PROTO);
+ p->bIsMeta = !mir_strcmp(p->proto, META_PROTO);
else
p->bIsMeta = FALSE;
if (p->bIsMeta && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) {
diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp index 4c840314b5..2b7036978b 100644 --- a/plugins/Clist_nicer/src/clistmod.cpp +++ b/plugins/Clist_nicer/src/clistmod.cpp @@ -52,7 +52,7 @@ int IconFromStatusMode(const char *szProto, int status, MCONTACT hContact, HICON char *szFinalProto;
int finalStatus;
- if (szProto != NULL && !strcmp(szProto, META_PROTO) && hContact != 0 && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) {
+ if (szProto != NULL && !mir_strcmp(szProto, META_PROTO) && hContact != 0 && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) {
MCONTACT hSubContact = db_mc_getMostOnline(hContact);
szFinalProto = GetContactProto(hSubContact);
finalStatus = (status == 0) ? (WORD) cfg::getWord(hSubContact, szFinalProto, "Status", ID_STATUS_OFFLINE) : status;
diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index dab1bcb663..c066d54371 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -418,7 +418,7 @@ void SetDBButtonStates(MCONTACT hPassedContact) DBVARIANT dbv = {0}; if (!cfg::getString(hFinalContact, szModule, szSetting, &dbv)) { - result = !strcmp((char *)buttonItem->bValuePush, dbv.pszVal); + result = !mir_strcmp((char *)buttonItem->bValuePush, dbv.pszVal); db_free(&dbv); } } diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index 0703e5dd8d..88aa33eb3e 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -262,7 +262,7 @@ StatusItems_t *GetProtocolStatusItem(const char *szProto) for (int i = SIZEOF(_StatusItems); i < arStatusItems.getCount(); i++) {
StatusItems_t *p = arStatusItems[i];
- if (!strcmp(p->szName[0] == '{' ? p->szName+3 : p->szName, szProto))
+ if (!mir_strcmp(p->szName[0] == '{' ? p->szName+3 : p->szName, szProto))
return p;
}
return NULL;
@@ -686,7 +686,7 @@ static void ReadItem(StatusItems_t *this_item, char *szItem, char *file) GetPrivateProfileStringA(szItem, "BasedOn", "None", buffer, 400, file);
- if (strcmp(buffer, "None")) {
+ if (mir_strcmp(buffer, "None")) {
for (int i = 0; i < arStatusItems.getCount(); i++) {
StatusItems_t *p = arStatusItems[i];
if (!_stricmp(p->szName[0] == '{' ? p->szName+3 : p->szName, buffer)) {
@@ -759,7 +759,7 @@ void IMG_ReadItem(const char *itemname, const char *szFileName) memset(&tmpItem, 0, sizeof(ImageItem));
GetPrivateProfileStringA(itemname, "Glyph", "None", buffer, 500, szFileName);
- if (strcmp(buffer, "None")) {
+ if (mir_strcmp(buffer, "None")) {
sscanf(buffer, "%d,%d,%d,%d", &tmpItem.glyphMetrics[0], &tmpItem.glyphMetrics[1],
&tmpItem.glyphMetrics[2], &tmpItem.glyphMetrics[3]);
if (tmpItem.glyphMetrics[2] > tmpItem.glyphMetrics[0] && tmpItem.glyphMetrics[3] > tmpItem.glyphMetrics[1]) {
@@ -770,7 +770,7 @@ void IMG_ReadItem(const char *itemname, const char *szFileName) }
}
GetPrivateProfileStringA(itemname, "Image", "None", buffer, 500, szFileName);
- if (strcmp(buffer, "None")) {
+ if (mir_strcmp(buffer, "None")) {
done_with_glyph:
@@ -805,7 +805,7 @@ done_with_glyph: }
}
GetPrivateProfileStringA(itemname, "Fillcolor", "None", buffer, 500, szFileName);
- if (strcmp(buffer, "None")) {
+ if (mir_strcmp(buffer, "None")) {
COLORREF fillColor = HexStringToLong(buffer);
tmpItem.fillBrush = CreateSolidBrush(fillColor);
tmpItem.dwFlags |= IMAGE_FILLSOLID;
@@ -855,9 +855,9 @@ done_with_glyph: for (n = 0; ; n++) {
mir_snprintf(szItemNr, SIZEOF(szItemNr), "Item%d", n);
GetPrivateProfileStringA(itemname, szItemNr, "None", buffer, 500, szFileName);
- if (!strcmp(buffer, "None"))
+ if (!mir_strcmp(buffer, "None"))
break;
- if (!strcmp(buffer, "CLUI")) {
+ if (!mir_strcmp(buffer, "CLUI")) {
if (!(tmpItem.dwFlags & IMAGE_GLYPH))
IMG_CreateItem(&tmpItem, szFinalName, hdc);
if (tmpItem.hbm || tmpItem.dwFlags & IMAGE_GLYPH) {
@@ -1128,7 +1128,7 @@ static void BTN_ReadItem(char *itemName, char *file) }
GetPrivateProfileStringA(itemName, "Tip", "None", szBuffer, 1000, file);
- if (strcmp(szBuffer, "None")) {
+ if (mir_strcmp(szBuffer, "None")) {
MultiByteToWideChar(cfg::dat.langPackCP, 0, szBuffer, -1, tmpItem.szTip, 256);
tmpItem.szTip[255] = 0;
}
@@ -1287,7 +1287,7 @@ void LoadPerContactSkins(TCHAR *tszFileName) int j;
for (j = 0; j < i - 1; j++) {
- if (!strcmp(szProto, items[j].szName) && !strcmp(UIN, items[j].szDBname) &&
+ if (!mir_strcmp(szProto, items[j].szName) && !mir_strcmp(UIN, items[j].szDBname) &&
mir_strlen(szProto) == mir_strlen(items[j].szName) && mir_strlen(UIN) == mir_strlen(items[j].szDBname)) {
cfg::writeDword(hContact, "EXTBK", "TEXT", items[j].TEXTCOLOR);
cfg::writeDword(hContact, "EXTBK", "COLOR1", items[j].COLOR);
diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index 451be1aacb..5694204f0d 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -663,7 +663,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_SSM", 246, szBuf);
db_unset(NULL, CLVM_MODULE, szSetting);
db_unset(NULL, CLVM_MODULE, szBuf);
- if (!strcmp(cfg::dat.current_viewmode, szBuf) && mir_strlen(szBuf) == mir_strlen(cfg::dat.current_viewmode)) {
+ if (!mir_strcmp(cfg::dat.current_viewmode, szBuf) && mir_strlen(szBuf) == mir_strlen(cfg::dat.current_viewmode)) {
cfg::dat.bFilterEffective = 0;
pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);
SetWindowTextA(hwndSelector, Translate("No view mode"));
diff --git a/plugins/CmdLine/MimCmd/src/MimCmd.cpp b/plugins/CmdLine/MimCmd/src/MimCmd.cpp index 90a66d5c36..688205e6f8 100644 --- a/plugins/CmdLine/MimCmd/src/MimCmd.cpp +++ b/plugins/CmdLine/MimCmd/src/MimCmd.cpp @@ -77,7 +77,7 @@ void ShowVersion() int main(int argc, char *argv[])
{
int error = 0;
- if ((argc == 2) && (strcmp(argv[1], "-v") == 0))
+ if ((argc == 2) && (mir_strcmp(argv[1], "-v") == 0))
{
ShowVersion();
diff --git a/plugins/CmdLine/MimCmd/src/commands.cpp b/plugins/CmdLine/MimCmd/src/commands.cpp index 6dddcffc43..44033eef7c 100644 --- a/plugins/CmdLine/MimCmd/src/commands.cpp +++ b/plugins/CmdLine/MimCmd/src/commands.cpp @@ -96,14 +96,14 @@ PCommand GetCommand(char *command) for (i = 0; i < cKnownCommands; i++)
{
- if (strcmp(knownCommands[i].command, lower) == 0)
+ if (mir_strcmp(knownCommands[i].command, lower) == 0)
{
return &knownCommands[i];
}
}
//allow more parameters to trigger the help command - /h -h /? --help
- if ((strcmp(lower, "/h") == 0) || (strcmp(lower, "-h") == 0) || (strcmp(lower, "/?") == 0) || (strcmp(lower, "--help") == 0))
+ if ((mir_strcmp(lower, "/h") == 0) || (mir_strcmp(lower, "-h") == 0) || (mir_strcmp(lower, "/?") == 0) || (mir_strcmp(lower, "--help") == 0))
{
for (i = 0; i < cKnownCommands; i++)
{
diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp index acf6932fbf..cb3d27d15b 100644 --- a/plugins/CmdLine/src/mimcmd_handlers.cpp +++ b/plugins/CmdLine/src/mimcmd_handlers.cpp @@ -40,7 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. __inline static int matches(char *command, char *lower)
{
- return ((strcmp(lower, command) == 0) || (strcmp(lower, Translate(command)) == 0));
+ return ((mir_strcmp(lower, command) == 0) || (mir_strcmp(lower, Translate(command)) == 0));
}
int Get2StateValue(char *state)
@@ -49,19 +49,19 @@ int Get2StateValue(char *state) STRNCPY(lower, state, sizeof(lower));
_strlwr(lower);
- //if ((strcmp(lower, "enable") == 0) || (strcmp(lower, "show") == 0) || (strcmp(lower, "on") == 0))
+ //if ((mir_strcmp(lower, "enable") == 0) || (mir_strcmp(lower, "show") == 0) || (mir_strcmp(lower, "on") == 0))
if ((matches("enable", lower)) || (matches("show", lower)) || (matches("on", lower)))
{
return STATE_ON;
}
- //if ((strcmp(lower, "disable") == 0) || (strcmp(lower, "hide") == 0) || (strcmp(lower, "off") == 0))
+ //if ((mir_strcmp(lower, "disable") == 0) || (mir_strcmp(lower, "hide") == 0) || (mir_strcmp(lower, "off") == 0))
if ((matches("disable", lower)) || (matches("hide", lower)) || (matches("off", lower)))
{
return STATE_OFF;
}
- //if (strcmp(lower, "toggle") == 0)
+ //if (mir_strcmp(lower, "toggle") == 0)
if (matches("toggle", lower))
{
return STATE_TOGGLE;
@@ -190,25 +190,25 @@ int ParseStatusParam(char *status) char *lower = NEWSTR_ALLOCA(status);
_strlwr(lower);
- if ( !strcmp(lower, "offline"))
+ if ( !mir_strcmp(lower, "offline"))
return ID_STATUS_OFFLINE;
- else if ( !strcmp(lower, "online"))
+ else if ( !mir_strcmp(lower, "online"))
return ID_STATUS_ONLINE;
- else if ( !strcmp(lower, "away"))
+ else if ( !mir_strcmp(lower, "away"))
return ID_STATUS_AWAY;
- else if ( !strcmp(lower, "dnd"))
+ else if ( !mir_strcmp(lower, "dnd"))
return ID_STATUS_DND;
- else if ( !strcmp(lower, "na"))
+ else if ( !mir_strcmp(lower, "na"))
return ID_STATUS_NA;
- else if ( !strcmp(lower, "occupied"))
+ else if ( !mir_strcmp(lower, "occupied"))
return ID_STATUS_OCCUPIED;
- else if ( !strcmp(lower, "freechat"))
+ else if ( !mir_strcmp(lower, "freechat"))
return ID_STATUS_FREECHAT;
- else if ( !strcmp(lower, "invisible"))
+ else if ( !mir_strcmp(lower, "invisible"))
return ID_STATUS_INVISIBLE;
- else if ( !strcmp(lower, "onthephone"))
+ else if ( !mir_strcmp(lower, "onthephone"))
return ID_STATUS_ONTHEPHONE;
- else if ( !strcmp(lower, "outtolunch"))
+ else if ( !mir_strcmp(lower, "outtolunch"))
return ID_STATUS_OUTTOLUNCH;
else
return 0;
@@ -673,7 +673,7 @@ void HandleQuitCommand(PCommand command, TArgument *argv, int argc, PReply reply STRNCPY(lower, argv[2], sizeof(lower));
_strlwr(lower);
- if (strcmp(lower, "wait") == 0)
+ if (mir_strcmp(lower, "wait") == 0)
{
CallService("CloseAction", 0, 0);
@@ -714,7 +714,7 @@ void HandleExchangeCommand(PCommand command, TArgument *argv, int argc, PReply r char lower[128];
STRNCPY(lower, argv[2], sizeof(lower));
_strlwr(lower);
- if (strcmp(lower, "check") == 0)
+ if (mir_strcmp(lower, "check") == 0)
{
INT_PTR ret = CallService(MS_EXCHANGE_CHECKEMAIL, 0, 0);
if (ret != CALLSERVICE_NOTFOUND)
@@ -748,7 +748,7 @@ void HandleYAMNCommand(PCommand command, TArgument *argv, int argc, PReply reply char lower[128];
STRNCPY(lower, argv[2], sizeof(lower));
_strlwr(lower);
- if (strcmp(lower, "check") == 0)
+ if (mir_strcmp(lower, "check") == 0)
{
if (ServiceExists(MS_YAMN_FORCECHECK))
{
@@ -987,7 +987,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r STRNCPY(dbcmd, argv[2], sizeof(dbcmd));
dbcmd[sizeof(dbcmd) - 1] = 0;
_strlwr(dbcmd);
- if (strcmp(dbcmd, "delete") == 0)
+ if (mir_strcmp(dbcmd, "delete") == 0)
{
if (argc == 5)
{
@@ -1003,7 +1003,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r HandleWrongParametersCount(command, reply);
}
}
- else if (strcmp(dbcmd, "set") == 0)
+ else if (mir_strcmp(dbcmd, "set") == 0)
{
if (argc == 6)
{
@@ -1058,7 +1058,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r HandleWrongParametersCount(command, reply);
}
}
- else if (strcmp(dbcmd, "get") == 0)
+ else if (mir_strcmp(dbcmd, "get") == 0)
{
if (argc == 5)
{
@@ -1108,19 +1108,19 @@ int ParseProxyType(char *type) lower[sizeof(lower) - 1] = 0;
_strlwr(lower);
- if (strcmp(lower, "socks4") == 0)
+ if (mir_strcmp(lower, "socks4") == 0)
{
return PROXY_SOCKS4;
}
- else if (strcmp(lower, "socks5") == 0)
+ else if (mir_strcmp(lower, "socks5") == 0)
{
return PROXY_SOCKS5;
}
- else if (strcmp(lower, "http") == 0)
+ else if (mir_strcmp(lower, "http") == 0)
{
return PROXY_HTTP;
}
- else if (strcmp(lower, "https") == 0)
+ else if (mir_strcmp(lower, "https") == 0)
{
return PROXY_HTTPS;
}
@@ -1168,7 +1168,7 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe char buffer[1024];
- if (strcmp(proxycmd, "status") == 0)
+ if (mir_strcmp(proxycmd, "status") == 0)
{//status command
switch (argc)
{
@@ -1232,7 +1232,7 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe return;
}
}
- else if (strcmp(proxycmd, "server") == 0)
+ else if (mir_strcmp(proxycmd, "server") == 0)
{
switch (argc)
{
@@ -1312,7 +1312,7 @@ void HandleProxyCommand(PCommand command, TArgument *argv, int argc, PReply repl ProtoEnumAccounts(&count, &accounts);
int i;
- int global = (strcmp(protocol, "GLOBAL") == 0);
+ int global = (mir_strcmp(protocol, "GLOBAL") == 0);
reply->message[0] = 0;
@@ -1330,7 +1330,7 @@ void HandleProxyCommand(PCommand command, TArgument *argv, int argc, PReply repl if (accounts[i]->bIsEnabled)
{
match = accounts[i]->szModuleName;
- if ((global) || (strcmp(protocol, match) == 0))
+ if ((global) || (mir_strcmp(protocol, match) == 0))
{
HandleProtocolProxyCommand(command, argv, argc, reply, match, match);
found = 1;
diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp index 1b3c436a2d..3326da9404 100644 --- a/plugins/ContactsPlus/src/utils.cpp +++ b/plugins/ContactsPlus/src/utils.cpp @@ -36,7 +36,7 @@ int __fastcall strcmpnull(const char *str1, const char *str2) {
if (!str1 || !str2) return 1;
- return strcmp(str1, str2);
+ return mir_strcmp(str1, str2);
}
void __fastcall strcpynull(char *str1, const char *str2)
diff --git a/plugins/CrashDumper/src/dumper.cpp b/plugins/CrashDumper/src/dumper.cpp index 5b7a879e02..6891a41e62 100644 --- a/plugins/CrashDumper/src/dumper.cpp +++ b/plugins/CrashDumper/src/dumper.cpp @@ -139,8 +139,8 @@ void GetLinkedModulesInfo(TCHAR *moduleName, CMString &buffer) ULONG* funcAddr = (ULONG*)ImageRvaToVa(nthdrs, dllAddr, exportData->AddressOfNames, NULL);
for (unsigned i = 0; i < exportData->NumberOfNames && !found; ++i) {
char* funcName = (char*)ImageRvaToVa(nthdrs, dllAddr, funcAddr[i], NULL);
- found = strcmp(funcName, "MirandaPluginInfoEx") == 0 || strcmp(funcName, "MirandaPluginInfo") == 0;
- if (strcmp(funcName, "DatabasePluginInfo") == 0) {
+ found = mir_strcmp(funcName, "MirandaPluginInfoEx") == 0 || mir_strcmp(funcName, "MirandaPluginInfo") == 0;
+ if (mir_strcmp(funcName, "DatabasePluginInfo") == 0) {
buffer.Append(TEXT(" This dll is a Miranda database plugin, another database is active right now\r\n"));
found = true;
}
@@ -319,7 +319,7 @@ static void GetProtocolStrings(CMString& buffer) for (j = 0; j < accCount; j++) {
for (i = 0; i < protoCountMy; i++)
- if (!strcmp(protoListMy[i], accList[j]->szProtoName))
+ if (!mir_strcmp(protoListMy[i], accList[j]->szProtoName))
break;
if (i == protoCountMy)
@@ -331,7 +331,7 @@ static void GetProtocolStrings(CMString& buffer) for (j = 0; j < accCount; j++)
for (i = 0; i < protoCountMy; i++)
- if (!strcmp(protoListMy[i], accList[j]->szProtoName)) {
+ if (!mir_strcmp(protoListMy[i], accList[j]->szProtoName)) {
protos[i].nloaded = accList[j]->bDynDisabled != 0;
if (IsAccountEnabled(accList[j]))
++protos[i].countse;
diff --git a/plugins/CrashDumper/src/upload.cpp b/plugins/CrashDumper/src/upload.cpp index 2413b92367..f375447bab 100644 --- a/plugins/CrashDumper/src/upload.cpp +++ b/plugins/CrashDumper/src/upload.cpp @@ -157,7 +157,7 @@ bool InternetDownloadFile(const char *szUrl, VerTrnsfr* szReq) // get the url for the new location and save it to szInfo
// look for the reply header "Location"
for (i = 0; i < nlhrReply->headersCount; i++) {
- if (!strcmp(nlhrReply->headers[i].szName, "Location")) {
+ if (!mir_strcmp(nlhrReply->headers[i].szName, "Location")) {
size_t rlen = 0;
if (nlhrReply->headers[i].szValue[0] == '/') {
const char* szPath;
@@ -250,5 +250,5 @@ bool ProcessVIHash(bool store) if (VIHash == NULL)
return false;
- return strcmp(hashstr, VIHash) == 0;
+ return mir_strcmp(hashstr, VIHash) == 0;
}
diff --git a/plugins/Db3x_mmap/src/dbcontacts.cpp b/plugins/Db3x_mmap/src/dbcontacts.cpp index 7b93cd2c4a..d201b2cedd 100644 --- a/plugins/Db3x_mmap/src/dbcontacts.cpp +++ b/plugins/Db3x_mmap/src/dbcontacts.cpp @@ -37,7 +37,7 @@ int CDb3Mmap::CheckProto(DBCachedContact *cc, const char *proto) cc->szProto = m_cache->GetCachedSetting(NULL, protobuf, 0, (int)mir_strlen(protobuf));
}
- return !strcmp(cc->szProto, proto);
+ return !mir_strcmp(cc->szProto, proto);
}
STDMETHODIMP_(LONG) CDb3Mmap::GetContactCount(void)
diff --git a/plugins/Db3x_mmap/src/dbintf.cpp b/plugins/Db3x_mmap/src/dbintf.cpp index 72b5c7b9a7..db90cd1db1 100644 --- a/plugins/Db3x_mmap/src/dbintf.cpp +++ b/plugins/Db3x_mmap/src/dbintf.cpp @@ -31,7 +31,7 @@ DBSignature dbSignatureSD = { "Miranda ICQ SD", 0x1A }; static int ModCompare(const ModuleName *mn1, const ModuleName *mn2)
{
- return strcmp(mn1->name, mn2->name);
+ return mir_strcmp(mn1->name, mn2->name);
}
static int OfsCompare(const ModuleName *mn1, const ModuleName *mn2)
@@ -41,7 +41,7 @@ static int OfsCompare(const ModuleName *mn1, const ModuleName *mn2) static int stringCompare2(const char *p1, const char *p2)
{
- return strcmp(p1, p2);
+ return mir_strcmp(p1, p2);
}
CDb3Mmap::CDb3Mmap(const TCHAR *tszFileName, int iMode) :
diff --git a/plugins/Db3x_mmap/src/dbmodulechain.cpp b/plugins/Db3x_mmap/src/dbmodulechain.cpp index db5e15ebed..6b2731747b 100644 --- a/plugins/Db3x_mmap/src/dbmodulechain.cpp +++ b/plugins/Db3x_mmap/src/dbmodulechain.cpp @@ -63,7 +63,7 @@ int CDb3Mmap::InitModuleNames(void) DWORD CDb3Mmap::FindExistingModuleNameOfs(const char *szName)
{
ModuleName mn = { (char*)szName, 0 };
- if (m_lastmn && !strcmp(mn.name, m_lastmn->name))
+ if (m_lastmn && !mir_strcmp(mn.name, m_lastmn->name))
return m_lastmn->ofs;
int index = m_lMods.getIndex(&mn);
diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp index bf8c494c60..4abaf4d7aa 100644 --- a/plugins/Db3x_mmap/src/dbsettings.cpp +++ b/plugins/Db3x_mmap/src/dbsettings.cpp @@ -31,14 +31,14 @@ DBCachedContact* AddToCachedContactList(MCONTACT contactID, int index); BOOL CDb3Mmap::IsSettingEncrypted(LPCSTR szModule, LPCSTR szSetting)
{
if (!_strnicmp(szSetting, "password", 8)) return true;
- if (!strcmp(szSetting, "NLProxyAuthPassword")) return true;
- if (!strcmp(szSetting, "LNPassword")) return true;
- if (!strcmp(szSetting, "FileProxyPassword")) return true;
- if (!strcmp(szSetting, "TokenSecret")) return true;
-
- if (!strcmp(szModule, "SecureIM")) {
- if (!strcmp(szSetting, "pgp")) return true;
- if (!strcmp(szSetting, "pgpPrivKey")) return true;
+ if (!mir_strcmp(szSetting, "NLProxyAuthPassword")) return true;
+ if (!mir_strcmp(szSetting, "LNPassword")) return true;
+ if (!mir_strcmp(szSetting, "FileProxyPassword")) return true;
+ if (!mir_strcmp(szSetting, "TokenSecret")) return true;
+
+ if (!mir_strcmp(szModule, "SecureIM")) {
+ if (!mir_strcmp(szSetting, "pgp")) return true;
+ if (!mir_strcmp(szSetting, "pgpPrivKey")) return true;
}
return false;
}
@@ -47,10 +47,10 @@ BOOL CDb3Mmap::IsSettingEncrypted(LPCSTR szModule, LPCSTR szSetting) static bool ValidLookupName(LPCSTR szModule, LPCSTR szSetting)
{
- if (!strcmp(szModule, META_PROTO))
- return strcmp(szSetting, "IsSubcontact") && strcmp(szSetting, "ParentMetaID");
+ if (!mir_strcmp(szModule, META_PROTO))
+ return mir_strcmp(szSetting, "IsSubcontact") && mir_strcmp(szSetting, "ParentMetaID");
- if (!strcmp(szModule, "Ignore"))
+ if (!mir_strcmp(szModule, "Ignore"))
return false;
return true;
@@ -478,7 +478,7 @@ STDMETHODIMP_(BOOL) CDb3Mmap::WriteContactSetting(MCONTACT contactID, DBCONTACTW case DBVT_WORD: bIsIdentical = pCachedValue->wVal == dbcwWork.value.wVal; break;
case DBVT_DWORD: bIsIdentical = pCachedValue->dVal == dbcwWork.value.dVal; break;
case DBVT_UTF8:
- case DBVT_ASCIIZ: bIsIdentical = strcmp(pCachedValue->pszVal, dbcwWork.value.pszVal) == 0; break;
+ case DBVT_ASCIIZ: bIsIdentical = mir_strcmp(pCachedValue->pszVal, dbcwWork.value.pszVal) == 0; break;
}
if (bIsIdentical)
return 0;
diff --git a/plugins/Db3x_mmap/src/dbtool/modulechain.cpp b/plugins/Db3x_mmap/src/dbtool/modulechain.cpp index 522532d8f4..c96d0b010e 100644 --- a/plugins/Db3x_mmap/src/dbtool/modulechain.cpp +++ b/plugins/Db3x_mmap/src/dbtool/modulechain.cpp @@ -91,7 +91,7 @@ int CDb3Mmap::WorkModuleChain(int firstTime) // check duplicated modulenames
int i, n = 0;
for (i = iCurrentModName + 1; i < modChainCount; i++)
- if (!strcmp(modChain[i].name, modChain[iCurrentModName].name)) {
+ if (!mir_strcmp(modChain[i].name, modChain[iCurrentModName].name)) {
modChain[i].ofsNew = modChain[iCurrentModName].ofsNew;
n++;
}
diff --git a/plugins/DbChecker/src/wizard.cpp b/plugins/DbChecker/src/wizard.cpp index e0d49c507d..58448a4e0f 100644 --- a/plugins/DbChecker/src/wizard.cpp +++ b/plugins/DbChecker/src/wizard.cpp @@ -32,11 +32,11 @@ static BOOL CALLBACK MyControlsEnumChildren(HWND hwnd, LPARAM) int makeBold = 0;
GetClassNameA(hwnd, szClass, sizeof(szClass));
- if (!strcmp(szClass, "Static")) {
+ if (!mir_strcmp(szClass, "Static")) {
if (((style & SS_TYPEMASK) == SS_LEFT || (style & SS_TYPEMASK) == SS_CENTER || (style & SS_TYPEMASK) == SS_RIGHT) && exstyle & WS_EX_CLIENTEDGE)
makeBold = 1;
}
- else if (!strcmp(szClass, "Button")) {
+ else if (!mir_strcmp(szClass, "Button")) {
if (exstyle&WS_EX_CLIENTEDGE)
makeBold = 1;
}
@@ -72,7 +72,7 @@ int DoMyControlProcessing(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam, if ((GetWindowLongPtr((HWND)lParam, GWL_STYLE) & 0xFFFF) == 0) {
char szText[256];
GetWindowTextA((HWND)lParam, szText, SIZEOF(szText));
- if (!strcmp(szText, "whiterect")) {
+ if (!mir_strcmp(szText, "whiterect")) {
SetTextColor((HDC)wParam, RGB(255, 255, 255));
SetBkColor((HDC)wParam, RGB(255, 255, 255));
SetBkMode((HDC)wParam, OPAQUE);
diff --git a/plugins/DbEditorPP/src/findwindow.cpp b/plugins/DbEditorPP/src/findwindow.cpp index 0762aeec5b..29962130c5 100644 --- a/plugins/DbEditorPP/src/findwindow.cpp +++ b/plugins/DbEditorPP/src/findwindow.cpp @@ -531,7 +531,7 @@ void __cdecl FindSettings(LPVOID di) switch (dbv.type) {
case DBVT_UTF8: // no conversion atm
case DBVT_ASCIIZ:
- if ((exactMatch && !(caseSensitive ? strcmp(dbv.pszVal, text) : strcmpi(dbv.pszVal, text))) || (!exactMatch && (caseSensitive ? strstr(dbv.pszVal, text) : StrStrI(dbv.pszVal, text)))) {
+ if ((exactMatch && !(caseSensitive ? mir_strcmp(dbv.pszVal, text) : strcmpi(dbv.pszVal, text))) || (!exactMatch && (caseSensitive ? strstr(dbv.pszVal, text) : StrStrI(dbv.pszVal, text)))) {
if ((mode & RW_FOUND) || (mode & RW_SETVAL))
replaceCount += replaceValue(hwnd, hContact, module->name, setting->name, &dbv, text, replace, mode);
else
@@ -578,7 +578,7 @@ void __cdecl FindSettings(LPVOID di) // check in setting name
if (inSettingName) {
- if ((exactMatch && !(caseSensitive ? strcmp(setting->name, text) : strcmpi(setting->name, text))) || (!exactMatch && (caseSensitive ? StrStrI(setting->name, text) : StrStrI(setting->name, text)))) {
+ if ((exactMatch && !(caseSensitive ? mir_strcmp(setting->name, text) : strcmpi(setting->name, text))) || (!exactMatch && (caseSensitive ? StrStrI(setting->name, text) : StrStrI(setting->name, text)))) {
if ((mode & RW_FOUND) || (mode & RW_SETNAME)) {
if (!GetSetting(hContact, module->name, setting->name, &dbv)) {
replaceCount += replaceSetting(hwnd, hContact, module->name, setting->name, &dbv, text, replace, mode);
@@ -596,7 +596,7 @@ void __cdecl FindSettings(LPVOID di) // check in module name
if (inModuleName) {
- if ((exactMatch && !(caseSensitive ? strcmp(module->name, text) : strcmpi(module->name, text))) || (!exactMatch && (caseSensitive ? strstr(module->name, text) : StrStrI(module->name, text)))) {
+ if ((exactMatch && !(caseSensitive ? mir_strcmp(module->name, text) : strcmpi(module->name, text))) || (!exactMatch && (caseSensitive ? strstr(module->name, text) : StrStrI(module->name, text)))) {
if ((mode & RW_FOUND) || (mode & RW_MODULE))
replaceCount += replaceModule(hwnd, hContact, module->name, text, replace, mode);
else
diff --git a/plugins/DbEditorPP/src/headers.h b/plugins/DbEditorPP/src/headers.h index 6501ff5165..425f14ec61 100644 --- a/plugins/DbEditorPP/src/headers.h +++ b/plugins/DbEditorPP/src/headers.h @@ -77,7 +77,7 @@ extern MCONTACT hRestore; #define mir_strlen(ptr) ((ptr == NULL) ? 0 : (int)mir_strlen(ptr))
#define mir_strncpy(dst, src, len) strncpy(dst, src, len)[len - 1] = 0;
-#define mir_strcmp(ptr1, ptr2) ((ptr1 && ptr2) ? strcmp(ptr1, ptr2) : 1) // (ptr1||ptr2)
+#define mir_strcmp(ptr1, ptr2) ((ptr1 && ptr2) ? mir_strcmp(ptr1, ptr2) : 1) // (ptr1||ptr2)
#define ListView_SetItemTextW(hwndLV, i, iSubItem_, pszText_) \
{ LV_ITEMW _ms_lvi;\
diff --git a/plugins/Dropbox/src/dropbox_events.cpp b/plugins/Dropbox/src/dropbox_events.cpp index be1e5a72be..b2d83e23ea 100644 --- a/plugins/Dropbox/src/dropbox_events.cpp +++ b/plugins/Dropbox/src/dropbox_events.cpp @@ -92,7 +92,7 @@ int CDropbox::OnSrmmWindowOpened(WPARAM, LPARAM lParam) int CDropbox::OnTabSrmmButtonPressed(WPARAM, LPARAM lParam)
{
CustomButtonClickData *cbc = (CustomButtonClickData *)lParam;
- if (!strcmp(cbc->pszModule, MODULE) && cbc->dwButtonId == BBB_ID_FILE_SEND && cbc->hContact)
+ if (!mir_strcmp(cbc->pszModule, MODULE) && cbc->dwButtonId == BBB_ID_FILE_SEND && cbc->hContact)
{
hTransferContact = cbc->hContact;
hTransferWindow = (HWND)CallService(MS_FILE_SENDFILE, GetDefaultContact(), 0);
@@ -150,7 +150,7 @@ int CDropbox::OnProtoAck(WPARAM, LPARAM lParam) {
ACKDATA *ack = (ACKDATA*)lParam;
- if (!strcmp(ack->szModule, MODULE))
+ if (!mir_strcmp(ack->szModule, MODULE))
return 0; // don't rebroadcast our own acks
if (ack->type == ACKTYPE_STATUS)
diff --git a/plugins/Dropbox/src/dropbox_services.cpp b/plugins/Dropbox/src/dropbox_services.cpp index cdce53b1fd..77baf2f5cc 100644 --- a/plugins/Dropbox/src/dropbox_services.cpp +++ b/plugins/Dropbox/src/dropbox_services.cpp @@ -181,7 +181,7 @@ INT_PTR CDropbox::ProtoSendMessage(WPARAM, LPARAM lParam) for (int i = 0; i < SIZEOF(commands); i++)
{
- if (!strcmp(szMessage+1, commands[i].szCommand))
+ if (!mir_strcmp(szMessage+1, commands[i].szCommand))
{
ULONG messageId = InterlockedIncrement(&hMessageProcess);
diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index 6505b3313a..b7883c1238 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -322,7 +322,7 @@ static void MatchMasks(TCHAR* szMirVer, short *base, short *overlay, short *over void __fastcall GetIconsIndexesA(LPSTR szMirVer, short *base, short *overlay, short *overlay2, short *overlay3, short *overlay4) { - if (strcmp(szMirVer, "?") == 0) { + if (mir_strcmp(szMirVer, "?") == 0) { *base = UNKNOWN_MASK_NUMBER; *overlay = -1; *overlay2 = -1; @@ -887,7 +887,7 @@ static int OnContactSettingChanged(WPARAM hContact, LPARAM lParam) return 0; DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; - if (cws && cws->szSetting && !strcmp(cws->szSetting, "MirVer")) { + if (cws && cws->szSetting && !mir_strcmp(cws->szSetting, "MirVer")) { switch (cws->value.type) { case DBVT_UTF8: ApplyFingerprintImage(hContact, ptrT(mir_utf8decodeT(cws->value.pszVal))); diff --git a/plugins/FloatingContacts/src/filedrop.cpp b/plugins/FloatingContacts/src/filedrop.cpp index ff1cb937e9..7a0f40adfc 100644 --- a/plugins/FloatingContacts/src/filedrop.cpp +++ b/plugins/FloatingContacts/src/filedrop.cpp @@ -217,8 +217,8 @@ static int CountFiles( char *szItem ) if ( fd.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY )
{
// Skip parent directories
- if (( 0 != strcmp( fd.cFileName, "." )) &&
- ( 0 != strcmp( fd.cFileName, ".." )) )
+ if (( 0 != mir_strcmp( fd.cFileName, "." )) &&
+ ( 0 != mir_strcmp( fd.cFileName, ".." )) )
{
char szDirName[MAX_PATH];
strncpy( szDirName, szItem, MAX_PATH - 1);
@@ -259,8 +259,8 @@ static void SaveFiles( char *szItem, char **ppFiles, int *pnCount ) if ( fd.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY )
{
// Skip parent directories
- if (( 0 != strcmp( fd.cFileName, "." )) &&
- ( 0 != strcmp( fd.cFileName, ".." )) )
+ if (( 0 != mir_strcmp( fd.cFileName, "." )) &&
+ ( 0 != mir_strcmp( fd.cFileName, ".." )) )
{
char szDirName[MAX_PATH];
strncpy( szDirName, szItem, MAX_PATH - 1);
diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp index 23e1fc2a4a..02c75a13cb 100644 --- a/plugins/Folders/src/dlg_handlers.cpp +++ b/plugins/Folders/src/dlg_handlers.cpp @@ -60,7 +60,7 @@ static void LoadRegisteredFolderItems(HWND hWnd) for (int i = 0; i < lstRegisteredFolders.getCount(); i++) {
CFolderItem &item = lstRegisteredFolders[i];
- if (!strcmp(szSection, item.GetSection())) {
+ if (!mir_strcmp(szSection, item.GetSection())) {
idx = SendMessage(hwndItems, LB_ADDSTRING, 0, (LPARAM)TranslateTS(item.GetUserName()));
SendMessage(hwndItems, LB_SETITEMDATA, idx, (LPARAM)&item);
}
diff --git a/plugins/Folders/src/folderItem.cpp b/plugins/Folders/src/folderItem.cpp index c00ef0cef6..d28872742e 100644 --- a/plugins/Folders/src/folderItem.cpp +++ b/plugins/Folders/src/folderItem.cpp @@ -57,12 +57,12 @@ int CFolderItem::IsEqual(const CFolderItem *other) int CFolderItem::IsEqual(const char *section, const TCHAR *name)
{
- return !_tcscmp(m_tszUserName, name) && !strcmp(m_szSection, section);
+ return !_tcscmp(m_tszUserName, name) && !mir_strcmp(m_szSection, section);
}
int CFolderItem::IsEqualTranslated(const char *trSection, const TCHAR *trName)
{
- return !_tcscmp(TranslateTS(m_tszUserName), trName) && !strcmp(Translate(m_szSection), trSection);
+ return !_tcscmp(TranslateTS(m_tszUserName), trName) && !mir_strcmp(Translate(m_szSection), trSection);
}
int CFolderItem::operator ==(const CFolderItem *other)
diff --git a/plugins/HTTPServer/src/FileShareNode.cpp b/plugins/HTTPServer/src/FileShareNode.cpp index 3f344a35cf..a9675f49cf 100644 --- a/plugins/HTTPServer/src/FileShareNode.cpp +++ b/plugins/HTTPServer/src/FileShareNode.cpp @@ -299,7 +299,7 @@ bool CLFileShareNode::bAddUser(CLShareUser * pclUser) { // iterate through its users
CLShareUser * pclCur = pclShare->pclCurrentUsers;
while (pclCur) {
- //strcmp(pclCur->szCurrentDLSrvPath, pclUser->szCurrentDLSrvPath) == 0) // same file
+ //mir_strcmp(pclCur->szCurrentDLSrvPath, pclUser->szCurrentDLSrvPath) == 0) // same file
if (memcmp(&pclCur->stAddr, &pclUser->stAddr, sizeof(in_addr)) == 0) // same IP
nUserConnectionCount++;
diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index f4ccb99546..0af77ce591 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -286,8 +286,8 @@ UINT_PTR CALLBACK ShareNewFileDialogHook( char pszFileName[MAX_PATH];
GetWindowText(hFileName, pszFileName, SIZEOF(pszFileName));
- if (strcmp(pstShare->pszSrvPath, szSelection) &&
- strcmp(pszFileName, pszShareDirStr)) {
+ if (mir_strcmp(pstShare->pszSrvPath, szSelection) &&
+ mir_strcmp(pszFileName, pszShareDirStr)) {
// a file was selected
// only reenable windows / set default values when a folder was selected before
@@ -325,7 +325,7 @@ UINT_PTR CALLBACK ShareNewFileDialogHook( strcat(szSelection, "/");
// only write to IDC_SHARE_NAME when a file / other folder was selected before
- if (!strcmp(szSelection, pstShare->pszSrvPath))
+ if (!mir_strcmp(szSelection, pstShare->pszSrvPath))
return false;
}
diff --git a/plugins/HTTPServer/src/HttpUser.cpp b/plugins/HTTPServer/src/HttpUser.cpp index 03e6b50c53..c8f111d5c2 100644 --- a/plugins/HTTPServer/src/HttpUser.cpp +++ b/plugins/HTTPServer/src/HttpUser.cpp @@ -521,7 +521,7 @@ bool CLHttpUser::bProcessGetRequest(char * pszRequest, bool bIsGetCommand) { FileTimeToUnixTime(&stFileTime, <ime);
strftime(szFileTime, sizeof(szFileTime), "%a, %d %b %Y %H:%M:%S GMT", gmtime(<ime));
- if (apszParam[eIfModifiedSince] && strcmp(apszParam[eIfModifiedSince], szFileTime) == 0) {
+ if (apszParam[eIfModifiedSince] && mir_strcmp(apszParam[eIfModifiedSince], szFileTime) == 0) {
SendError(304, "Not Modified" );
return true;
}
diff --git a/plugins/HTTPServer/src/IndexHTML.cpp b/plugins/HTTPServer/src/IndexHTML.cpp index 222e24b332..a37ef808db 100644 --- a/plugins/HTTPServer/src/IndexHTML.cpp +++ b/plugins/HTTPServer/src/IndexHTML.cpp @@ -93,19 +93,19 @@ bool LoadIndexHTMLTemplate() { *pszDestBuf = '#';
// signs below 32 are not used anyway
- if (!strcmp(pszKeywordBegin, "End")) *pszDestBuf = SY_END;
- else if (!strcmp(pszKeywordBegin, "ForDirectoriesDo")) *pszDestBuf = SY_FOR_DIRS;
- else if (!strcmp(pszKeywordBegin, "DirectoryUrl")) *pszDestBuf = SY_DIR_URL;
- else if (!strcmp(pszKeywordBegin, "DirectoryName")) *pszDestBuf = SY_DIR_NAME;
- else if (!strcmp(pszKeywordBegin, "ForFilesDo")) *pszDestBuf = SY_FOR_FILES;
- else if (!strcmp(pszKeywordBegin, "FileUrl")) *pszDestBuf = SY_FILE_URL;
- else if (!strcmp(pszKeywordBegin, "FileName")) *pszDestBuf = SY_FILE_NAME;
- else if (!strcmp(pszKeywordBegin, "FileSize")) *pszDestBuf = SY_FILE_SIZE;
- else if (!strcmp(pszKeywordBegin, "FileCreated")) *pszDestBuf = SY_FILE_CREATE_TIME;
- else if (!strcmp(pszKeywordBegin, "FileModified")) *pszDestBuf = SY_FILE_MODIFY_TIME;
- else if (!strcmp(pszKeywordBegin, "IsEven")) *pszDestBuf = SY_IS_EVEN;
- else if (!strcmp(pszKeywordBegin, "IsOdd")) *pszDestBuf = SY_IS_ODD;
- else if (!strcmp(pszKeywordBegin, "IsFileType")) *pszDestBuf = SY_IS_FILE_TYPE;
+ if (!mir_strcmp(pszKeywordBegin, "End")) *pszDestBuf = SY_END;
+ else if (!mir_strcmp(pszKeywordBegin, "ForDirectoriesDo")) *pszDestBuf = SY_FOR_DIRS;
+ else if (!mir_strcmp(pszKeywordBegin, "DirectoryUrl")) *pszDestBuf = SY_DIR_URL;
+ else if (!mir_strcmp(pszKeywordBegin, "DirectoryName")) *pszDestBuf = SY_DIR_NAME;
+ else if (!mir_strcmp(pszKeywordBegin, "ForFilesDo")) *pszDestBuf = SY_FOR_FILES;
+ else if (!mir_strcmp(pszKeywordBegin, "FileUrl")) *pszDestBuf = SY_FILE_URL;
+ else if (!mir_strcmp(pszKeywordBegin, "FileName")) *pszDestBuf = SY_FILE_NAME;
+ else if (!mir_strcmp(pszKeywordBegin, "FileSize")) *pszDestBuf = SY_FILE_SIZE;
+ else if (!mir_strcmp(pszKeywordBegin, "FileCreated")) *pszDestBuf = SY_FILE_CREATE_TIME;
+ else if (!mir_strcmp(pszKeywordBegin, "FileModified")) *pszDestBuf = SY_FILE_MODIFY_TIME;
+ else if (!mir_strcmp(pszKeywordBegin, "IsEven")) *pszDestBuf = SY_IS_EVEN;
+ else if (!mir_strcmp(pszKeywordBegin, "IsOdd")) *pszDestBuf = SY_IS_ODD;
+ else if (!mir_strcmp(pszKeywordBegin, "IsFileType")) *pszDestBuf = SY_IS_FILE_TYPE;
else {
LogEvent("Error in index template", "Unknown Tag");
// unknown tag
@@ -355,9 +355,9 @@ bool bCreateIndexHTML(const char * pszRealPath, const char * pszIndexPath, }
}
- while (!strcmp(fdFindFileData.cFileName, ".") ||
+ while (!mir_strcmp(fdFindFileData.cFileName, ".") ||
!strncmp(fdFindFileData.cFileName, "@", 1) ||
- (!strcmp(fdFindFileData.cFileName, "..") && !strcmp(pszSrvPath, "/")) || // hide .. in root
+ (!mir_strcmp(fdFindFileData.cFileName, "..") && !mir_strcmp(pszSrvPath, "/")) || // hide .. in root
((*pszPos == 19) == ((fdFindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0))) {
if (!FindNextFile(hFind, &fdFindFileData)) {
FindClose(hFind);
diff --git a/plugins/HTTPServer/src/IndexXML.cpp b/plugins/HTTPServer/src/IndexXML.cpp index 99526c5d79..11ee766135 100644 --- a/plugins/HTTPServer/src/IndexXML.cpp +++ b/plugins/HTTPServer/src/IndexXML.cpp @@ -128,9 +128,9 @@ bool bCreateIndexXML(const char * pszRealPath, const char * pszIndexPath, // Find files and directories
do {
- if (strcmp(fdFindFileData.cFileName, ".") &&
+ if (mir_strcmp(fdFindFileData.cFileName, ".") &&
strncmp(fdFindFileData.cFileName, "@", 1) &&
- (strcmp(fdFindFileData.cFileName, "..") || strcmp(pszSrvPath, "/"))) { // hide .. in root
+ (mir_strcmp(fdFindFileData.cFileName, "..") || mir_strcmp(pszSrvPath, "/"))) { // hide .. in root
pszBuffer = szBuffer;
strcpy(szFileName, fdFindFileData.cFileName);
diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp index 029bc234ba..d63307f5f4 100644 --- a/plugins/HTTPServer/src/main.cpp +++ b/plugins/HTTPServer/src/main.cpp @@ -486,7 +486,7 @@ static INT_PTR nGetShare(WPARAM /*wParam*/, LPARAM lParam) { STFileShareInfo * pclShare = (STFileShareInfo*)lParam;
CLFileShareNode * pclCur = pclFirstNode;
while (pclCur) {
- if (strcmp(pclCur->st.pszSrvPath, pclShare->pszSrvPath) == 0) {
+ if (mir_strcmp(pclCur->st.pszSrvPath, pclShare->pszSrvPath) == 0) {
if (pclShare->dwMaxRealPath <= mir_strlen(pclCur->st.pszRealPath) + 1)
return 1003;
strcpy(pclShare->pszRealPath, pclCur->st.pszRealPath);
diff --git a/plugins/HistoryStats/src/_strfunc.h b/plugins/HistoryStats/src/_strfunc.h index 0726c50698..dfaf172c79 100644 --- a/plugins/HistoryStats/src/_strfunc.h +++ b/plugins/HistoryStats/src/_strfunc.h @@ -13,7 +13,7 @@ namespace ext {
public:
static const char* chr(const char* string, char c) { return strchr(string, c); }
- static int cmp(const char* string1, const char* string2) { return strcmp(string1, string2); }
+ static int cmp(const char* string1, const char* string2) { return mir_strcmp(string1, string2); }
static int icmp(const char* string1, const char* string2) { return _stricmp(string1, string2); }
static int coll(const char* string1, const char* string2) { return strcoll(string1, string2); }
static int icoll(const char* string1, const char* string2) { return _stricoll(string1, string2); }
diff --git a/plugins/HistoryStats/src/mirandacontact.cpp b/plugins/HistoryStats/src/mirandacontact.cpp index f9e9a2d02e..35bce22df6 100644 --- a/plugins/HistoryStats/src/mirandacontact.cpp +++ b/plugins/HistoryStats/src/mirandacontact.cpp @@ -41,7 +41,7 @@ void MirandaContact::fetchSlot(int i) void MirandaContact::stripMetaID(DBEVENTINFO& dbe)
{
- if (strcmp(dbe.szModule,META_PROTO)==0) {
+ if (mir_strcmp(dbe.szModule,META_PROTO)==0) {
char* pTextBegin = reinterpret_cast<char*>(dbe.pBlob);
if (dbe.cbBlob >= 6 && !pTextBegin[dbe.cbBlob - 1]) {
diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp index de2e5e7b61..3a4031f2ec 100644 --- a/plugins/IEView/src/HTMLBuilder.cpp +++ b/plugins/IEView/src/HTMLBuilder.cpp @@ -127,7 +127,7 @@ char* HTMLBuilder::getRealProto(MCONTACT hContact) return NULL;
char *szProto = mir_strdup(GetContactProto(hContact));
- if (szProto != NULL && !strcmp(szProto, META_PROTO)) {
+ if (szProto != NULL && !mir_strcmp(szProto, META_PROTO)) {
hContact = db_mc_getMostOnline(hContact);
if (hContact != NULL)
replaceStr(szProto, GetContactProto(hContact));
@@ -137,7 +137,7 @@ char* HTMLBuilder::getRealProto(MCONTACT hContact) char* HTMLBuilder::getRealProto(MCONTACT hContact, const char *szProto)
{
- if (szProto != NULL && !strcmp(szProto, META_PROTO)) {
+ if (szProto != NULL && !mir_strcmp(szProto, META_PROTO)) {
hContact = db_mc_getMostOnline(hContact);
if (hContact != NULL)
return mir_strdup(GetContactProto(hContact));
@@ -148,7 +148,7 @@ char* HTMLBuilder::getRealProto(MCONTACT hContact, const char *szProto) MCONTACT HTMLBuilder::getRealContact(MCONTACT hContact)
{
char *szProto = GetContactProto(hContact);
- if (szProto != NULL && !strcmp(szProto, META_PROTO))
+ if (szProto != NULL && !mir_strcmp(szProto, META_PROTO))
hContact = db_mc_getMostOnline(hContact);
return hContact;
}
diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index 7d5528eb9d..bd63b8a9aa 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -1489,7 +1489,7 @@ void Options::init() proto = new ProtocolSettings("_default_");
proto->setSRMMEnable(true);
}
- else if (strcmp(pProtos[i - 1]->szModuleName, META_PROTO)) {
+ else if (mir_strcmp(pProtos[i - 1]->szModuleName, META_PROTO)) {
if ((CallProtoService(pProtos[i - 1]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM) == 0)
continue;
diff --git a/plugins/IEView/src/Template.cpp b/plugins/IEView/src/Template.cpp index d405277f28..e9a6271fde 100644 --- a/plugins/IEView/src/Template.cpp +++ b/plugins/IEView/src/Template.cpp @@ -113,7 +113,7 @@ Template* Template::getNext() bool Template::equals(const char *name)
{
- if (!strcmp(name, this->name))
+ if (!mir_strcmp(name, this->name))
return true;
return false;
@@ -252,7 +252,7 @@ TemplateMap* TemplateMap::add(const char *id, const char *filename) {
TemplateMap *map;
for (map = mapList; map != NULL; map = map->next) {
- if (!strcmp(map->name, id)) {
+ if (!mir_strcmp(map->name, id)) {
map->clear();
map->setFilename(filename);
return map;
@@ -425,7 +425,7 @@ Template* TemplateMap::getTemplate(const char *text) Template* TemplateMap::getTemplate(const char *proto, const char *text)
{
for (TemplateMap *ptr = mapList; ptr != NULL; ptr = ptr->next)
- if (!strcmp(ptr->name, proto))
+ if (!mir_strcmp(ptr->name, proto))
return ptr->getTemplate(text);
return NULL;
@@ -434,7 +434,7 @@ Template* TemplateMap::getTemplate(const char *proto, const char *text) TemplateMap* TemplateMap::getTemplateMap(const char *proto)
{
for (TemplateMap *ptr = mapList; ptr != NULL; ptr = ptr->next)
- if (!strcmp(ptr->name, proto))
+ if (!mir_strcmp(ptr->name, proto))
return ptr;
return NULL;
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index b761b3ae90..8a016603e6 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -93,7 +93,7 @@ static bool CompareDb(DBVARIANT &dbv1, DBVARIANT &dbv2) case DBVT_ASCIIZ:
case DBVT_UTF8:
- return 0 == strcmp(dbv1.pszVal, dbv2.pszVal);
+ return 0 == mir_strcmp(dbv1.pszVal, dbv2.pszVal);
}
}
return false;
@@ -383,7 +383,7 @@ static bool FindDestAccount(const char *szProto) if (pam.pa == NULL)
continue;
- if (!strcmp(pam.pa->szModuleName, szProto))
+ if (!mir_strcmp(pam.pa->szModuleName, szProto))
return true;
}
@@ -929,7 +929,7 @@ static void ImportHistory(MCONTACT hContact, PROTOACCOUNT **protocol, int protoC if (hDst == NULL) {
bSkipAll = true;
for (int i = 0; i < protoCount; i++) {
- if (!strcmp(dbei.szModule, protocol[i]->szModuleName)) {
+ if (!mir_strcmp(dbei.szModule, protocol[i]->szModuleName)) {
bSkipAll = false;
break;
}
diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp index eb6b3f68ff..85932785a4 100644 --- a/plugins/KeyboardNotify/src/main.cpp +++ b/plugins/KeyboardNotify/src/main.cpp @@ -223,7 +223,7 @@ BOOL checkProtocol(char *szProto) return FALSE; for (int i=0; i < ProtoList.protoCount; i++) - if (ProtoList.protoInfo[i].szProto && !strcmp(ProtoList.protoInfo[i].szProto, szProto)) + if (ProtoList.protoInfo[i].szProto && !mir_strcmp(ProtoList.protoInfo[i].szProto, szProto)) return ProtoList.protoInfo[i].enabled; return FALSE; @@ -233,7 +233,7 @@ BOOL metaCheckProtocol(char *szProto, MCONTACT hContact, WORD eventType) { MCONTACT hSubContact=NULL; - if (bMetaProtoEnabled && szProto && !strcmp(META_PROTO, szProto)) + if (bMetaProtoEnabled && szProto && !mir_strcmp(META_PROTO, szProto)) if (hSubContact = db_mc_getMostOnline(hContact)) szProto = GetContactProto(hSubContact); @@ -378,7 +378,7 @@ BOOL checkXstatus(char *szProto) return checkGlobalXstatus(); for (int i=0; i < ProtoList.protoCount; i++) - if (ProtoList.protoInfo[i].szProto && !strcmp(ProtoList.protoInfo[i].szProto, szProto)) { + if (ProtoList.protoInfo[i].szProto && !mir_strcmp(ProtoList.protoInfo[i].szProto, szProto)) { if (!ProtoList.protoInfo[i].xstatus.count) return TRUE; // Retrieve xstatus for protocol @@ -670,7 +670,7 @@ void createProtocolList(void) else { strcpy(ProtoList.protoInfo[i].szProto, proto[i]->szModuleName); ProtoList.protoInfo[i].enabled = FALSE; - if (!strcmp(proto[i]->szModuleName, META_PROTO)) + if (!mir_strcmp(proto[i]->szModuleName, META_PROTO)) ProtoList.protoInfo[i].visible = FALSE; else { ProtoList.protoInfo[i].visible = TRUE; diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index 8b21e14214..6b1c50d224 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -520,7 +520,7 @@ INT_PTR ListeningToEnabled(WPARAM wParam, LPARAM lParam) ProtocolInfo *GetProtoInfo(char *proto)
{
for (unsigned int i = 1; i < proto_items.size(); i++)
- if (strcmp(proto, proto_items[i].proto) == 0)
+ if (mir_strcmp(proto, proto_items[i].proto) == 0)
return &proto_items[i];
return NULL;
@@ -947,11 +947,11 @@ int SettingChanged(WPARAM hContact,LPARAM lParam) return 0;
DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
- if (strcmp(cws->szSetting, "ListeningTo") != 0)
+ if (mir_strcmp(cws->szSetting, "ListeningTo") != 0)
return 0;
char *proto = GetContactProto(hContact);
- if (proto == NULL || strcmp(cws->szModule, proto) != 0)
+ if (proto == NULL || mir_strcmp(cws->szModule, proto) != 0)
return 0;
if (cws->value.type == DBVT_DELETED || cws->value.ptszVal == NULL || cws->value.ptszVal[0] == 0)
diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index 9a46adf9c5..c8683feba1 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -621,7 +621,7 @@ void checkthread(void*) log_p(L"checkthread: OSPathNetConstruct: %S", fullpath);
if (error = (NSFDbOpen1) (fullpath, &db_handle)) {
- if(strcmp(settingServerSec, "") != 0) {
+ if(mir_strcmp(settingServerSec, "") != 0) {
if (error = (OSPathNetConstruct1)(NULL, settingServerSec, settingDatabase, fullpath)) {
goto errorblock;
} else {
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index 0d30f8bf24..1a379b065a 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -694,7 +694,7 @@ INT_PTR onChangeProto(WPARAM wparam, LPARAM lparam) {
MCONTACT hContact = (MCONTACT)wparam, hContactNew;
char* szProto = GetContactProto(hContact);
- if (!strcmp(szProto, (char*)lparam))
+ if (!mir_strcmp(szProto, (char*)lparam))
return 0;
if (CTRL_IS_PRESSED) {
@@ -815,7 +815,7 @@ int BuildMenu(WPARAM wparam, LPARAM) if (pa && (bShowAll || (flags & VF_PROTO))) {
for (int i = 0; i < protoCount; i++) {
- if ((!accs[i]->bIsEnabled) || (strcmp(pa->szProtoName, accs[i]->szProtoName)))
+ if ((!accs[i]->bIsEnabled) || (mir_strcmp(pa->szProtoName, accs[i]->szProtoName)))
hide = 1;
else {
hide = 0;
@@ -900,7 +900,7 @@ static int TabsrmmButtonPressed(WPARAM wParam, LPARAM lParam) {
CustomButtonClickData *cbcd = (CustomButtonClickData *)lParam;
- if (!strcmp(cbcd->pszModule, MODULENAME) && cbcd->dwButtonId == 0)
+ if (!mir_strcmp(cbcd->pszModule, MODULENAME) && cbcd->dwButtonId == 0)
onRecvFiles(wParam, 0);
return 0;
diff --git a/plugins/MirOTR/src/dbfilter.cpp b/plugins/MirOTR/src/dbfilter.cpp index 676de8c404..fa65dd8ddc 100644 --- a/plugins/MirOTR/src/dbfilter.cpp +++ b/plugins/MirOTR/src/dbfilter.cpp @@ -60,7 +60,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam) if (db_get_b(hContact, proto, "ChatRoom", 0) == 1) return 0; - if(strcmp(proto, META_PROTO) == 0) { + if(mir_strcmp(proto, META_PROTO) == 0) { hContact = db_mc_getMostOnline(hContact); if (!hContact) return 0; proto = GetContactProto(hContact); @@ -278,7 +278,7 @@ int StatusModeChange(WPARAM wParam, LPARAM lParam) { ConnContext *context = otr_user_state->context_root; while(context) { - if(context->msgstate == OTRL_MSGSTATE_ENCRYPTED && (proto == 0 || strcmp(proto, context->protocol) == 0)) { + if(context->msgstate == OTRL_MSGSTATE_ENCRYPTED && (proto == 0 || mir_strcmp(proto, context->protocol) == 0)) { hContact = (MCONTACT)context->app_data; if(hContact) { @@ -298,7 +298,7 @@ int OnContactSettingChanged(WPARAM hContact, LPARAM lParam) if (!options.end_offline) return 0; DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *)lParam; - if (!lParam || strcmp(cws->szSetting, "Status") != 0) return 0; + if (!lParam || mir_strcmp(cws->szSetting, "Status") != 0) return 0; int status=0; switch (cws->value.type){ case DBVT_WORD: diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp index 6345502f7c..72b5d0d023 100644 --- a/plugins/MirOTR/src/options.cpp +++ b/plugins/MirOTR/src/options.cpp @@ -322,7 +322,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsProto(HWND hwndDlg, UINT msg, WPARAM wP PROTOACCOUNT **pppDesc; ProtoEnumAccounts(&num_protocols, &pppDesc); for (int i = 0; i < num_protocols; i++) { - if (!strcmp(pppDesc[i]->szModuleName, META_PROTO)) + if (!mir_strcmp(pppDesc[i]->szModuleName, META_PROTO)) continue; if ((CallProtoService(pppDesc[i]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM) == 0) continue; @@ -504,7 +504,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsContacts(HWND hwndDlg, UINT msg, WPARAM for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { const char *proto = GetContactProto(hContact); if (proto && db_get_b(hContact, proto, "ChatRoom", 0) == 0 && CallService(MS_PROTO_ISPROTOONCONTACT, hContact, (LPARAM)MODULENAME) // ignore chatrooms - && strcmp(proto, META_PROTO) != 0) // and MetaContacts + && mir_strcmp(proto, META_PROTO) != 0) // and MetaContacts { lvI.iItem = 0; lvI.iSubItem = 0; diff --git a/plugins/MirOTR/src/otr.cpp b/plugins/MirOTR/src/otr.cpp index 8c185d99af..2bccd99338 100644 --- a/plugins/MirOTR/src/otr.cpp +++ b/plugins/MirOTR/src/otr.cpp @@ -249,7 +249,7 @@ extern "C" { proto = GetContactProto((MCONTACT)opdata); // ugly wokaround for ICQ. ICQ protocol reports more than 7k, but in SMP this is too long. // possibly ICQ doesn't allow single words without spaces to become longer than ~2340? - if (strcmp("ICQ", proto) == 0 || strncmp("ICQ_", proto, 4) == 0) + if (mir_strcmp("ICQ", proto) == 0 || strncmp("ICQ_", proto, 4) == 0) return 2340; return CallProtoService(proto, PS_GETCAPS, PFLAG_MAXLENOFMESSAGE, (LPARAM)opdata); } diff --git a/plugins/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/src/svcs_menu.cpp index ff963c9dd1..17a3b589ae 100644 --- a/plugins/MirOTR/src/svcs_menu.cpp +++ b/plugins/MirOTR/src/svcs_menu.cpp @@ -192,7 +192,7 @@ hide_all: return 0; } - if(proto && strcmp(proto, META_PROTO) == 0) { + if(proto && mir_strcmp(proto, META_PROTO) == 0) { // make menu act as per most online subcontact hContact = db_mc_getMostOnline(hContact); if (!hContact) diff --git a/plugins/MirOTR/src/svcs_proto.cpp b/plugins/MirOTR/src/svcs_proto.cpp index dcce57fc22..b3dc9f4269 100644 --- a/plugins/MirOTR/src/svcs_proto.cpp +++ b/plugins/MirOTR/src/svcs_proto.cpp @@ -14,7 +14,7 @@ INT_PTR SVC_OTRSendMessage(WPARAM wParam,LPARAM lParam){ return CallService(MS_PROTO_CHAINSEND, wParam, lParam); char *proto = GetContactProto(ccs->hContact); - if(proto && strcmp(proto, META_PROTO) == 0) // bypass for metacontacts + if(proto && mir_strcmp(proto, META_PROTO) == 0) // bypass for metacontacts return CallService(MS_PROTO_CHAINSEND, wParam, lParam); if (!proto || !ccs->hContact) @@ -89,7 +89,7 @@ INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam) char *proto = GetContactProto(ccs->hContact); if (!proto || !ccs->hContact) return 1; //error - else if(proto && strcmp(proto, META_PROTO) == 0) // bypass for metacontacts + else if(proto && mir_strcmp(proto, META_PROTO) == 0) // bypass for metacontacts return CallService(MS_PROTO_CHAINRECV, wParam, lParam); char *oldmessage = pre->szMessage; diff --git a/plugins/MirOTR/src/svcs_srmm.cpp b/plugins/MirOTR/src/svcs_srmm.cpp index 27eb741700..62f37c9daa 100644 --- a/plugins/MirOTR/src/svcs_srmm.cpp +++ b/plugins/MirOTR/src/svcs_srmm.cpp @@ -9,7 +9,7 @@ int SVC_IconPressed(WPARAM hContact, LPARAM lParam) if(sicd->cbSize < sizeof(StatusIconClickData)) return 0; - if(strcmp(sicd->szModule, MODULENAME) == 0) { + if(mir_strcmp(sicd->szModule, MODULENAME) == 0) { char *proto = GetContactProto(hContact); if(proto && db_get_b(hContact, proto, "ChatRoom", 0)) return 0; @@ -95,7 +95,7 @@ int SVC_ButtonsBarLoaded(WPARAM, LPARAM) int SVC_ButtonsBarPressed(WPARAM w, LPARAM l) { CustomButtonClickData* cbcd = (CustomButtonClickData *)l; - if (cbcd->cbSize == sizeof(CustomButtonClickData) && cbcd->dwButtonId == 0 && strcmp(cbcd->pszModule, MODULENAME)==0) { + if (cbcd->cbSize == sizeof(CustomButtonClickData) && cbcd->dwButtonId == 0 && mir_strcmp(cbcd->pszModule, MODULENAME)==0) { MCONTACT hContact = (MCONTACT)w; char *proto = GetContactProto(hContact); diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp index 9755c3fc18..31f629d350 100644 --- a/plugins/MirOTR/src/utils.cpp +++ b/plugins/MirOTR/src/utils.cpp @@ -11,9 +11,9 @@ MCONTACT find_contact(const char* userid, const char* protocol) { for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { const char *proto = GetContactProto(hContact); - if(proto && strcmp(proto, protocol) == 0) { + if(proto && mir_strcmp(proto, protocol) == 0) { char *name = contact_get_id(hContact); - if(name && strcmp(name, userid) == 0) { + if(name && mir_strcmp(name, userid) == 0) { mir_free(name); return hContact; } diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp index c42196e8fa..435ebd3db8 100644 --- a/plugins/MirandaG15/src/CAppletManager.cpp +++ b/plugins/MirandaG15/src/CAppletManager.cpp @@ -1505,7 +1505,7 @@ int CAppletManager::HookStatusChanged(WPARAM wParam, LPARAM lParam) { DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; - if ((wParam == 0) || (strcmp(cws->szSetting,"Status") != NULL)) + if ((wParam == 0) || (mir_strcmp(cws->szSetting,"Status") != NULL)) return 0; diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp index 0844fad72d..d8286b8d08 100644 --- a/plugins/NewAwaySysMod/src/AwaySys.cpp +++ b/plugins/NewAwaySysMod/src/AwaySys.cpp @@ -122,7 +122,7 @@ int StatusMsgReq(WPARAM wParam, LPARAM lParam, CString &szProto) if (db_get_dw(hContact, szCurProto, "UIN", 0) == lParam) {
szFoundProto = szCurProto;
hFoundContact = hContact;
- if (!strcmp(szCurProto, szProto))
+ if (!mir_strcmp(szCurProto, szProto))
break;
}
}
@@ -353,7 +353,7 @@ int PreBuildContactMenu(WPARAM hContact, LPARAM) static int DBSettingChanged(WPARAM hContact, LPARAM lParam)
{
DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
- if (hContact != NULL && !strcmp(cws->szSetting, "Status"))
+ if (hContact != NULL && !mir_strcmp(cws->szSetting, "Status"))
db_set_w(hContact, "UserOnline", "OldStatus", cws->value.wVal);
return 0;
diff --git a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp index 7625b0cc9a..b3f1478f5e 100644 --- a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp +++ b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp @@ -879,7 +879,7 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA if (CallProtoService(p->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) {
PROTOACCOUNT * acc = ProtoGetAccount(p->szModuleName);
hItem = CList->AddInfo(TCString(_T("* ")) + acc->tszAccountName + _T(" *"), CLC_ROOT, hItem, (LPARAM)p->szModuleName, LoadSkinnedProtoIcon(p->szModuleName, g_ProtoStates[p->szModuleName].Status));
- if (dat->szProtocol && !strcmp(p->szModuleName, dat->szProtocol))
+ if (dat->szProtocol && !mir_strcmp(p->szModuleName, dat->szProtocol))
hSelItem = hItem;
}
}
diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index c06d1bd639..7127d00345 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -379,7 +379,7 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus) char *szProto = GetContactProto(hContact);
WORD myStatus = (WORD)CallProtoService(szProto, PS_GETSTATUS, 0, 0);
- if (!strcmp(szProto, META_PROTO)) { //this contact is Meta
+ if (!mir_strcmp(szProto, META_PROTO)) { //this contact is Meta
MCONTACT hSubContact = db_mc_getMostOnline(hContact);
char *szSubProto = GetContactProto(hSubContact);
if (szSubProto == NULL)
@@ -479,7 +479,7 @@ int ProcessStatus(DBCONTACTWRITESETTING *cws, MCONTACT hContact) return 0;
char *szProto = GetContactProto(hContact);
- if (strcmp(cws->szModule, szProto))
+ if (mir_strcmp(cws->szModule, szProto))
return 0;
// we don't want to be notified if new chatroom comes online
@@ -576,10 +576,10 @@ int ProcessExtraStatus(DBCONTACTWRITESETTING *cws, MCONTACT hContact) }
if (strstr(cws->szSetting, "XStatus")) {
- if (strcmp(cws->szModule, szProto))
+ if (mir_strcmp(cws->szModule, szProto))
return 0;
- if (strcmp(cws->szSetting, "XStatusName") == 0) {
+ if (mir_strcmp(cws->szSetting, "XStatusName") == 0) {
smi.compare = CompareStatusMsg(&smi, cws, "LastXStatusName");
if (smi.compare == COMPARE_SAME) {
replaceStrT(smi.newstatusmsg, 0);
@@ -594,7 +594,7 @@ int ProcessExtraStatus(DBCONTACTWRITESETTING *cws, MCONTACT hContact) xsc = NewXSC(hContact, szProto, TYPE_ICQ_XSTATUS, smi.compare, smi.newstatusmsg, NULL);
ExtraStatusChanged(xsc);
}
- else if (!strcmp(cws->szSetting, "XStatusMsg")) {
+ else if (!mir_strcmp(cws->szSetting, "XStatusMsg")) {
smi.compare = CompareStatusMsg(&smi, cws, "LastXStatusMsg");
if (smi.compare == COMPARE_SAME) {
replaceStrT(smi.newstatusmsg, 0);
@@ -790,11 +790,11 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) if (ProcessExtraStatus(cws, hContact))
return 0;
- if (!strcmp(cws->szSetting, "Status"))
+ if (!mir_strcmp(cws->szSetting, "Status"))
if (ProcessStatus(cws, hContact))
return 0;
- if (!strcmp(cws->szModule, "CList") && !strcmp(cws->szSetting, "StatusMsg"))
+ if (!mir_strcmp(cws->szModule, "CList") && !mir_strcmp(cws->szSetting, "StatusMsg"))
if (ProcessStatusMessage(cws, hContact))
return 0;
diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp index 42ec34c325..07bfbf22be 100644 --- a/plugins/NewXstatusNotify/src/xstatus.cpp +++ b/plugins/NewXstatusNotify/src/xstatus.cpp @@ -433,7 +433,7 @@ TCHAR* GetIcqXStatus(MCONTACT hContact, char *szProto, char *szValue, TCHAR *buf int statusID = db_get_b(hContact, szProto, "XStatusId", -1);
if (statusID != -1) {
if (!db_get_ts(hContact, szProto, szValue, &dbv)) {
- if ((strcmp(szValue, "XStatusName") == 0) && dbv.ptszVal[0] == 0)
+ if ((mir_strcmp(szValue, "XStatusName") == 0) && dbv.ptszVal[0] == 0)
GetDefaultXstatusName(statusID, szProto, buff, bufflen);
else
_tcsncpy(buff, dbv.ptszVal, bufflen);
diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp index 7ca182d3d6..451bd8af1c 100755 --- a/plugins/New_GPG/src/main.cpp +++ b/plugins/New_GPG/src/main.cpp @@ -322,7 +322,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR { char buf[64]; GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, SIZEOF(buf)); - if(!strcmp(buf, Translate("Default"))) + if(!mir_strcmp(buf, Translate("Default"))) { db_set_s(NULL, szGPGModuleName, "GPGPubKey", out.c_str()); db_set_ts(NULL, szGPGModuleName, "KeyMainName", name); @@ -340,7 +340,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR acc_str += "_KeyID"; db_set_ts(NULL, szGPGModuleName, acc_str.c_str(), fp); } - if(!strcmp(buf, Translate("Default"))) + if(!mir_strcmp(buf, Translate("Default"))) { wstring keyinfo = TranslateT("Default private key ID"); keyinfo += _T(": "); @@ -497,7 +497,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR { char buf[64]; GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, SIZEOF(buf)); - if(!strcmp(buf, Translate("Default"))) + if(!mir_strcmp(buf, Translate("Default"))) { db_unset(NULL, szGPGModuleName, "GPGPubKey"); db_unset(NULL, szGPGModuleName, "KeyID"); @@ -625,7 +625,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR { char buf[64]; GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, SIZEOF(buf)); - if(!strcmp(buf, Translate("Default"))) + if(!mir_strcmp(buf, Translate("Default"))) { db_set_s(NULL, szGPGModuleName, "GPGPubKey", out.c_str()); db_set_ts(NULL, szGPGModuleName, "KeyID", fp); @@ -650,7 +650,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR { char buf[64]; GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, SIZEOF(buf)); - if(!strcmp(buf, Translate("Default"))) + if(!mir_strcmp(buf, Translate("Default"))) { string keyinfo = Translate("key ID"); keyinfo += ": "; diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp index 045623b8b0..1e0951af35 100755 --- a/plugins/New_GPG/src/options.cpp +++ b/plugins/New_GPG/src/options.cpp @@ -217,7 +217,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP for(MCONTACT hcnttmp = db_find_first(); hcnttmp != NULL; hcnttmp = db_find_next(hcnttmp)) {
if(hcnttmp != hContact) {
char *tmp2 = UniGetContactSettingUtf(hcnttmp, szGPGModuleName, "KeyID", "");
- if(!strcmp(tmp, tmp2)) {
+ if(!mir_strcmp(tmp, tmp2)) {
mir_free(tmp2);
keep = true;
break;
diff --git a/plugins/New_GPG/src/srmm.cpp b/plugins/New_GPG/src/srmm.cpp index 1cca711d67..f1b646ff06 100644 --- a/plugins/New_GPG/src/srmm.cpp +++ b/plugins/New_GPG/src/srmm.cpp @@ -44,7 +44,7 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) else if(db_mc_isSub(hContact))
hMeta = db_mc_getMeta(hContact);
StatusIconClickData *sicd = (StatusIconClickData *)lParam;
- if(strcmp(sicd->szModule, szGPGModuleName))
+ if(mir_strcmp(sicd->szModule, szGPGModuleName))
return 0; // not our event
BYTE enc = db_get_b(hContact, szGPGModuleName, "GPGEncryption", 0);
diff --git a/plugins/NewsAggregator/Src/ExportImport.cpp b/plugins/NewsAggregator/Src/ExportImport.cpp index 78e58a8ffe..a7da89e57d 100644 --- a/plugins/NewsAggregator/Src/ExportImport.cpp +++ b/plugins/NewsAggregator/Src/ExportImport.cpp @@ -165,7 +165,7 @@ INT_PTR CALLBACK DlgProcImportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM BYTE GroupExist = 0;
do {
group_name = (char *)CallService(MS_CLIST_GROUPGETNAME, (WPARAM)hGroup, 0);
- if (group_name != NULL && !strcmp(group_name, _T2A(utfgroup))) {
+ if (group_name != NULL && !mir_strcmp(group_name, _T2A(utfgroup))) {
GroupExist = 1;
break;
}
diff --git a/plugins/NewsAggregator/Src/Icons.cpp b/plugins/NewsAggregator/Src/Icons.cpp index 011fe57c58..93c2ad1f5d 100644 --- a/plugins/NewsAggregator/Src/Icons.cpp +++ b/plugins/NewsAggregator/Src/Icons.cpp @@ -46,7 +46,7 @@ HICON LoadIconEx(const char *name, bool big) HANDLE GetIconHandle(const char *name)
{
for (int i=0; i < SIZEOF(iconList); i++)
- if ( !strcmp(iconList[i].szName, name))
+ if ( !mir_strcmp(iconList[i].szName, name))
return iconList[i].hIcolib;
return NULL;
diff --git a/plugins/NewsAggregator/Src/Utils.cpp b/plugins/NewsAggregator/Src/Utils.cpp index 8750bde3df..01cf2ae15d 100644 --- a/plugins/NewsAggregator/Src/Utils.cpp +++ b/plugins/NewsAggregator/Src/Utils.cpp @@ -25,7 +25,7 @@ bool UpdateListFlag = FALSE; bool IsMyContact(MCONTACT hContact)
{
const char *szProto = GetContactProto(hContact);
- return szProto != NULL && strcmp(MODULE, szProto) == 0;
+ return szProto != NULL && mir_strcmp(MODULE, szProto) == 0;
}
void NetlibInit()
diff --git a/plugins/NoHistory/src/dllmain.cpp b/plugins/NoHistory/src/dllmain.cpp index a8d0f00abe..1cf1a3233a 100644 --- a/plugins/NoHistory/src/dllmain.cpp +++ b/plugins/NoHistory/src/dllmain.cpp @@ -211,7 +211,7 @@ int IconPressed(WPARAM hContact, LPARAM lParam) return 0;
if (sicd->flags & MBCF_RIGHTBUTTON) return 0; // ignore right-clicks
- if (strcmp(sicd->szModule, MODULE) != 0) return 0; // not our event
+ if (mir_strcmp(sicd->szModule, MODULE) != 0) return 0; // not our event
char *proto = GetContactProto(hContact);
bool chat_room = (proto && db_get_b(hContact, proto, "ChatRoom", 0) != 0);
diff --git a/plugins/Non-IM Contact/src/contactinfo.cpp b/plugins/Non-IM Contact/src/contactinfo.cpp index f6d23ee084..24703b4c93 100644 --- a/plugins/Non-IM Contact/src/contactinfo.cpp +++ b/plugins/Non-IM Contact/src/contactinfo.cpp @@ -494,9 +494,9 @@ INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam) return 1;
while (fgets(line, 2000, file)) {
- if (!strcmp(line, "\r\n\0"))
+ if (!mir_strcmp(line, "\r\n\0"))
continue;
- if (!strcmp(line, "[Non-IM Contact]\r\n"))
+ if (!mir_strcmp(line, "[Non-IM Contact]\r\n"))
contactDone = 0;
else if (!strncmp(line, "Name=", mir_strlen("Name="))) {
i = (int)mir_strlen("Name="); j = 0;
@@ -554,7 +554,7 @@ INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam) i = (int)mir_strlen("Minutes=");
sscanf(&line[i], "%d", &minutes);
}
- else if (contactDone && !strcmp(line, "[/Non-IM Contact]\r\n")) {
+ else if (contactDone && !mir_strcmp(line, "[/Non-IM Contact]\r\n")) {
if (!name) continue;
size_t size = mir_strlen(name) + mir_strlen("Do you want to import this Non-IM Contact?\r\n\r\nName: \r\n") + 1;
char *msg = (char*)malloc(size);
diff --git a/plugins/Non-IM Contact/src/dialog.cpp b/plugins/Non-IM Contact/src/dialog.cpp index d41cb61fed..9e6fb07c4d 100644 --- a/plugins/Non-IM Contact/src/dialog.cpp +++ b/plugins/Non-IM Contact/src/dialog.cpp @@ -139,7 +139,7 @@ INT_PTR CALLBACK TestWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP GetDlgItemTextA(hwnd, IDC_STRING, tmp, SIZEOF(tmp));
if (tmp[mir_strlen(tmp) - 1] == '(') {
for (i = 0; i < VARS; i++) {
- if (!strcmp(braceList[i].var, &tmp[mir_strlen(tmp) - mir_strlen(braceList[i].var)])) {
+ if (!mir_strcmp(braceList[i].var, &tmp[mir_strlen(tmp) - mir_strlen(braceList[i].var)])) {
for (j = 0; j < MAX_BRACES; j++) {
if (!braceOrder[j]) {
braceOrder[j] = i;
diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index 6c8df00ec8..3956f03fe1 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -29,10 +29,10 @@ INT_PTR doubleClick(WPARAM wParam, LPARAM lParam) char program[MAX_PATH], params[MAX_PATH];
int shellEXEerror = 0;
char* proto = GetContactProto(wParam);
- if (proto && !strcmp(proto, MODNAME)) {
+ if (proto && !mir_strcmp(proto, MODNAME)) {
if (GetKeyState(VK_CONTROL) & 0x8000) // ctrl is pressed
editContact(wParam, 0); // for later when i add a second double click setting
- else if (db_get_static(wParam, MODNAME, "Program", program, SIZEOF(program)) && strcmp(program, "")) {
+ else if (db_get_static(wParam, MODNAME, "Program", program, SIZEOF(program)) && mir_strcmp(program, "")) {
if (!db_get_static(wParam, MODNAME, "ProgramParams", params, SIZEOF(params)))
strcpy(params, "");
if (strstr(program, "http://") || strstr(program, "https://"))
diff --git a/plugins/Non-IM Contact/src/namereplacing.cpp b/plugins/Non-IM Contact/src/namereplacing.cpp index edfa7dd539..091b9e3718 100644 --- a/plugins/Non-IM Contact/src/namereplacing.cpp +++ b/plugins/Non-IM Contact/src/namereplacing.cpp @@ -219,7 +219,7 @@ void checkStringForcompare(char *str) Y = strtok(NULL, ",\")");
j = Y - ©OfStr[i] + (int)mir_strlen(Y) + 1;
if (A && B && X && Y) {
- if (!strcmp(A, B))
+ if (!mir_strcmp(A, B))
strcat(newStr, X);
else strcat(newStr, Y);
}
@@ -613,7 +613,7 @@ void WriteSetting(MCONTACT hContact, char* module1, char* setting1, char* module break;
}
// strip the tab and new lines from all except the tooltip
- if (!error && strcmp(setting1, "ToolTip")) stripWhiteSpace(newString);
+ if (!error && mir_strcmp(setting1, "ToolTip")) stripWhiteSpace(newString);
db_set_s(hContact, module2, setting2, newString);
}
else db_set_s(hContact, module2, setting2, "");
diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index ae631dba26..49a8530db7 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -193,7 +193,7 @@ static void RemoveReminderSystemEvent(REMINDERDATA *p) break;
if ((ULONG)pev->lParam == p->uid && !pev->hContact
- && pev->pszService && !strcmp(pev->pszService, MODULENAME"/OpenTriggeredReminder"))
+ && pev->pszService && !mir_strcmp(pev->pszService, MODULENAME"/OpenTriggeredReminder"))
{
if ( !CallService(MS_CLIST_REMOVEEVENT,(WPARAM)pev->hContact,(LPARAM)pev->hDbEvent) )
{
diff --git a/plugins/NotifyAnything/SendLog/SLImp.cpp b/plugins/NotifyAnything/SendLog/SLImp.cpp index 0a4b69e81c..3b9982c460 100644 --- a/plugins/NotifyAnything/SendLog/SLImp.cpp +++ b/plugins/NotifyAnything/SendLog/SLImp.cpp @@ -16,19 +16,19 @@ void implementation(int argc, char **argv, bool console) bool tcp = false;
const char *target = "127.0.0.1";
- if (argc >= 2 && !strcmp("-T", argv[1])) {
+ if (argc >= 2 && !mir_strcmp("-T", argv[1])) {
tcp = true;
argc -= 1;
argv += 1;
}
- if (argc >= 3 && !strcmp("-H", argv[1])) {
+ if (argc >= 3 && !mir_strcmp("-H", argv[1])) {
target = argv[2];
argc -= 2;
argv += 2;
}
- if (argc >= 3 && !strcmp("-P", argv[1])) {
+ if (argc >= 3 && !mir_strcmp("-P", argv[1])) {
port = atoi(argv[2]);
argc -= 2;
argv += 2;
@@ -69,7 +69,7 @@ void implementation(int argc, char **argv, bool console) if (connect(sock, (const SOCKADDR *) &to, sizeof to))
throw (DWORD) WSAGetLastError();
- if (console && (argc == 1 || argc == 3 && !strcmp("-p", argv[1]))) {
+ if (console && (argc == 1 || argc == 3 && !mir_strcmp("-p", argv[1]))) {
std::string prefix;
if (argc == 3)
prefix = argv[2];
diff --git a/plugins/NotifyAnything/SendLog/SendLog.cpp b/plugins/NotifyAnything/SendLog/SendLog.cpp index 5cb46932da..eab3ec3452 100644 --- a/plugins/NotifyAnything/SendLog/SendLog.cpp +++ b/plugins/NotifyAnything/SendLog/SendLog.cpp @@ -9,7 +9,7 @@ void implementation(int argc, char **argv, bool console); int main(int argc, char **argv)
try
{
- if (argc == 2 && !strcmp("/?", argv[1])) {
+ if (argc == 2 && !mir_strcmp("/?", argv[1])) {
std::cout << "\n"
"Syntax: sendlog [-T] [-H host] [-P port] [-p prefix]\n"
"\tSends each input line as a separate message, with optional prefix.\n"
diff --git a/plugins/NotifyAnything/SendLog/SendLogWin.cpp b/plugins/NotifyAnything/SendLog/SendLogWin.cpp index 37f112efb8..72f50e3d44 100644 --- a/plugins/NotifyAnything/SendLog/SendLogWin.cpp +++ b/plugins/NotifyAnything/SendLog/SendLogWin.cpp @@ -9,7 +9,7 @@ void implementation(int argc, char **argv, bool console); int main(int argc, char **argv)
try
{
- if (argc == 1 || argc == 2 && !strcmp("/?", argv[1])) {
+ if (argc == 1 || argc == 2 && !mir_strcmp("/?", argv[1])) {
MessageBox(NULL, "Syntax: sendlog32 [-T] [-H host] [-P port] text\n"
"\tSends single text message.", "Sendlog32", MB_OK);
return 0;
diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index c982d21336..7859e28be8 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -34,7 +34,7 @@ INT_PTR NudgeShowMenu(WPARAM wParam, LPARAM lParam) bool bEnabled = false;
for (int i = 0; i < arNudges.getCount(); i++) {
CNudgeElement &p = arNudges[i];
- if (!strcmp((char*)wParam, p.ProtocolName)) {
+ if (!mir_strcmp((char*)wParam, p.ProtocolName)) {
bEnabled = (GlobalNudge.useByProtocol) ? p.enabled : DefaultNudge.enabled;
break;
}
@@ -54,7 +54,7 @@ INT_PTR NudgeSend(WPARAM hContact, LPARAM lParam) if (GlobalNudge.useByProtocol) {
for (int i = 0; i < arNudges.getCount(); i++) {
CNudgeElement &p = arNudges[i];
- if (!strcmp(protoName, p.ProtocolName))
+ if (!mir_strcmp(protoName, p.ProtocolName))
Nudge_ShowPopup(&p, hContact, msg);
}
}
@@ -68,7 +68,7 @@ INT_PTR NudgeSend(WPARAM hContact, LPARAM lParam) if (GlobalNudge.useByProtocol) {
for (int i = 0; i < arNudges.getCount(); i++) {
CNudgeElement &p = arNudges[i];
- if (!strcmp(protoName, p.ProtocolName))
+ if (!mir_strcmp(protoName, p.ProtocolName))
if (p.showStatus)
Nudge_SentStatus(&p, hContact);
}
@@ -105,7 +105,7 @@ int NudgeReceived(WPARAM hContact, LPARAM lParam) if (GlobalNudge.useByProtocol) {
for (int i = 0; i < arNudges.getCount(); i++) {
CNudgeElement &p = arNudges[i];
- if (!strcmp(protoName, p.ProtocolName)) {
+ if (!mir_strcmp(protoName, p.ProtocolName)) {
if (p.enabled) {
if (p.useIgnoreSettings && CallService(MS_IGNORE_ISIGNORED, hContact, IGNOREEVENT_USERONLINE))
@@ -240,7 +240,7 @@ static int TabsrmmButtonPressed(WPARAM wParam, LPARAM lParam) {
CustomButtonClickData *cbcd = (CustomButtonClickData *)lParam;
- if (!strcmp(cbcd->pszModule, "Nudge"))
+ if (!mir_strcmp(cbcd->pszModule, "Nudge"))
NudgeSend(wParam, 0);
return 0;
diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index fc5f7b9bc7..b4b49f4ab9 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -351,7 +351,7 @@ void LoadContacts(HWND hwndDlg, BOOL show_all) if ((!show_all && opts.hide_subcontacts) || opts.group_append)
hMeta = db_mc_getMeta(hContact);
}
- else if (!strcmp(META_PROTO, pszProto))
+ else if (!mir_strcmp(META_PROTO, pszProto))
continue;
if (!show_all)
diff --git a/plugins/QuickMessages/src/main.cpp b/plugins/QuickMessages/src/main.cpp index c3ee162400..e68d39aff2 100644 --- a/plugins/QuickMessages/src/main.cpp +++ b/plugins/QuickMessages/src/main.cpp @@ -156,7 +156,7 @@ static int CustomButtonPressed(WPARAM wParam,LPARAM lParam) SortedList* sl=NULL;
int state=0;
- if(strcmp(cbcd->pszModule,PLGNAME)) return 0;
+ if(mir_strcmp(cbcd->pszModule,PLGNAME)) return 0;
if (!ButtonsList[cbcd->dwButtonId]) return 1;
diff --git a/plugins/QuickReplies/src/events.cpp b/plugins/QuickReplies/src/events.cpp index 493ade4f56..67476f6f6a 100644 --- a/plugins/QuickReplies/src/events.cpp +++ b/plugins/QuickReplies/src/events.cpp @@ -82,7 +82,7 @@ int OnButtonPressed(WPARAM wParam, LPARAM lParam) CustomButtonClickData *cbcd = (CustomButtonClickData *)lParam;
mir_snprintf(buttonName, SIZEOF(buttonName), MODULE" %x", iNumber + 1);
- if (strcmp(cbcd->pszModule, buttonName))
+ if (mir_strcmp(cbcd->pszModule, buttonName))
return 0;
if (cbcd->dwButtonId != iNumber)
diff --git a/plugins/RemovePersonalSettings/src/rps.cpp b/plugins/RemovePersonalSettings/src/rps.cpp index cc646f791c..aa654a90c3 100644 --- a/plugins/RemovePersonalSettings/src/rps.cpp +++ b/plugins/RemovePersonalSettings/src/rps.cpp @@ -566,7 +566,7 @@ void DeleteFileOrFolder(const char *name) }
do {
- if (strcmp(findData.cFileName, ".") && strcmp(findData.cFileName, "..")) {
+ if (mir_strcmp(findData.cFileName, ".") && mir_strcmp(findData.cFileName, "..")) {
strcpy(strTmp, findData.cFileName);
DeleteFileOrFolder(tmp);
}
@@ -586,7 +586,7 @@ void DeleteFileOrFolder(const char *name) HANDLE hwnd = FindFirstFileA(tmp, &findData);
if (hwnd != INVALID_HANDLE_VALUE) {
do {
- if (strcmp(findData.cFileName, ".") && strcmp(findData.cFileName, "..")) {
+ if (mir_strcmp(findData.cFileName, ".") && mir_strcmp(findData.cFileName, "..")) {
mir_snprintf(tmp, SIZEOF(tmp), "%s\\%s", name, findData.cFileName);
DeleteFileOrFolder(tmp);
}
@@ -629,7 +629,7 @@ int EnumProc(const char *szName, LPARAM lParam) if (dms->filter != NULL && dms->lenFilterMinusOne > 0) {
if (len >= dms->lenFilterMinusOne) {
if (dms->filter[0] == '*') {
- if (strcmp(&dms->filter[1], &szName[len - dms->lenFilterMinusOne]) != 0)
+ if (mir_strcmp(&dms->filter[1], &szName[len - dms->lenFilterMinusOne]) != 0)
return 0;
}
else { // if (dms->filter[dms->lenFilterMinusOne] == '*')
diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp index db0ba35a56..aa3d58ea1f 100644 --- a/plugins/Scriver/src/globals.cpp +++ b/plugins/Scriver/src/globals.cpp @@ -215,7 +215,7 @@ void ReleaseIcons() HICON GetCachedIcon(const char *name)
{
for (int i = 0; i < SIZEOF(iconList); i++)
- if (!strcmp(iconList[i].szName, name))
+ if (!mir_strcmp(iconList[i].szName, name))
return Skin_GetIconByHandle(iconList[i].hIcolib);
return NULL;
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 586f449cea..52840bd307 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -1053,7 +1053,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP mir_snprintf(buf, SIZEOF(buf), Translate("User menu - %s"), idbuf);
SendDlgItemMessage(hwndDlg, IDC_USERMENU, BUTTONADDTOOLTIP, (WPARAM)buf, 0);
- if (cws && !strcmp(cws->szModule, dat->szProto) && !strcmp(cws->szSetting, "Status"))
+ if (cws && !mir_strcmp(cws->szModule, dat->szProto) && !mir_strcmp(cws->szSetting, "Status"))
dat->wStatus = cws->value.wVal;
SetStatusIcon(dat);
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 9d6724ed1e..c557fc6776 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -415,7 +415,7 @@ int StatusIconPressed(WPARAM wParam, LPARAM lParam) hwnd = SM_FindWindowByContact(wParam);
if (hwnd != NULL) {
- if (!strcmp(SRMMMOD, sicd->szModule)) {
+ if (!mir_strcmp(SRMMMOD, sicd->szModule)) {
if (sicd->dwId == 0 && g_dat.hMenuANSIEncoding) {
if (sicd->flags & MBCF_RIGHTBUTTON) {
int codePage = (int) SendMessage(hwnd, DM_GETCODEPAGE, 0, 0);
diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index 9db60844c2..61e09f5ff2 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -1495,7 +1495,7 @@ int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) s = (dbv1.type == DBVT_ASCIIZ);
d = (dbv2.type == DBVT_ASCIIZ);
if (s && d) {
- s = strcmp(dbv1.pszVal, dbv2.pszVal);
+ s = mir_strcmp(dbv1.pszVal, dbv2.pszVal);
d = 0;
}
db_free(&dbv1);
@@ -1512,7 +1512,7 @@ int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) if(!db_get_s(p2->hContact, MODULENAME, "gpg", &dbv2)) {
d = (dbv2.type == DBVT_ASCIIZ);
if (s && d) {
- s = strcmp(dbv1.pszVal, dbv2.pszVal);
+ s = mir_strcmp(dbv1.pszVal, dbv2.pszVal);
d = 0;
}
db_free(&dbv1);
diff --git a/plugins/SecureIM/src/svcs_clist.cpp b/plugins/SecureIM/src/svcs_clist.cpp index 0b677659c0..0d5dd38d57 100644 --- a/plugins/SecureIM/src/svcs_clist.cpp +++ b/plugins/SecureIM/src/svcs_clist.cpp @@ -3,7 +3,7 @@ int __cdecl onContactSettingChanged(WPARAM hContact, LPARAM lParam)
{
DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
- if (!hContact || strcmp(cws->szSetting, "Status")) return 0;
+ if (!hContact || mir_strcmp(cws->szSetting, "Status")) return 0;
pUinKey ptr = getUinKey(hContact);
int stat = getContactStatus(hContact);
diff --git a/plugins/SecureIM/src/svcs_srmm.cpp b/plugins/SecureIM/src/svcs_srmm.cpp index 9d021aae42..e2583947d2 100644 --- a/plugins/SecureIM/src/svcs_srmm.cpp +++ b/plugins/SecureIM/src/svcs_srmm.cpp @@ -15,7 +15,7 @@ int __cdecl onIconPressed(WPARAM hContact, LPARAM lParam) hContact = db_mc_getMostOnline(hContact); // âîçüìåì òîò, ÷åðåç êîòîðûé ïîéäåò ñîîáùåíèå
StatusIconClickData *sicd = (StatusIconClickData *)lParam;
- if (strcmp(sicd->szModule, MODULENAME) != 0 || !isSecureProtocol(hContact))
+ if (mir_strcmp(sicd->szModule, MODULENAME) != 0 || !isSecureProtocol(hContact))
return 0; // not our event
if (!isContactPGP(hContact) && !isContactGPG(hContact) && !isChatRoom(hContact)) {
diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp index c8de06f57b..a38aeba407 100644 --- a/plugins/SeenPlugin/src/utils.cpp +++ b/plugins/SeenPlugin/src/utils.cpp @@ -63,7 +63,7 @@ BOOL isYahoo(char *protoname) if (protoname) {
char *pszUniqueSetting = (char*)CallProtoService(protoname, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);
if (pszUniqueSetting)
- return !strcmp(pszUniqueSetting, "yahoo_id");
+ return !mir_strcmp(pszUniqueSetting, "yahoo_id");
}
return FALSE;
}
@@ -73,7 +73,7 @@ BOOL isJabber(char *protoname) if (protoname) {
char *pszUniqueSetting = (char*)CallProtoService(protoname, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);
if (pszUniqueSetting)
- return !strcmp(pszUniqueSetting, "jid");
+ return !mir_strcmp(pszUniqueSetting, "jid");
}
return FALSE;
}
@@ -83,7 +83,7 @@ BOOL isICQ(char *protoname) if (protoname) {
char *pszUniqueSetting = (char*)CallProtoService(protoname, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);
if (pszUniqueSetting)
- return !strcmp(pszUniqueSetting, "UIN");
+ return !mir_strcmp(pszUniqueSetting, "UIN");
}
return FALSE;
}
@@ -93,7 +93,7 @@ BOOL isMSN(char *protoname) if (protoname) {
char *pszUniqueSetting = (char*)CallProtoService(protoname, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);
if (pszUniqueSetting)
- return !strcmp(pszUniqueSetting, "e-mail");
+ return !mir_strcmp(pszUniqueSetting, "e-mail");
}
return FALSE;
}
@@ -560,7 +560,7 @@ int UpdateValues(WPARAM hContact, LPARAM lparam) DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *)lparam;
char *szProto = GetContactProto(hContact);
- if (cws->value.type == DBVT_DWORD && !strcmp(cws->szSetting, "LastSeen") && !mir_strcmp(cws->szModule, szProto)) {
+ if (cws->value.type == DBVT_DWORD && !mir_strcmp(cws->szSetting, "LastSeen") && !mir_strcmp(cws->szModule, szProto)) {
DBWriteTimeTS(cws->value.dVal, hContact);
HWND hwnd = WindowList_Find(g_pUserInfo, hContact);
@@ -569,11 +569,11 @@ int UpdateValues(WPARAM hContact, LPARAM lparam) return 0;
}
- BOOL isIdleEvent = includeIdle ? (strcmp(cws->szSetting, "IdleTS") == 0) : 0;
- if (strcmp(cws->szSetting, "Status") && strcmp(cws->szSetting, "StatusTriger") && (isIdleEvent == 0))
+ BOOL isIdleEvent = includeIdle ? (mir_strcmp(cws->szSetting, "IdleTS") == 0) : 0;
+ if (mir_strcmp(cws->szSetting, "Status") && mir_strcmp(cws->szSetting, "StatusTriger") && (isIdleEvent == 0))
return 0;
- if (!strcmp(cws->szModule, S_MOD)) {
+ if (!mir_strcmp(cws->szModule, S_MOD)) {
// here we will come when Settings/SeenModule/StatusTriger is changed
WORD prevStatus = db_get_w(hContact, S_MOD, "OldStatus", ID_STATUS_OFFLINE);
if (includeIdle) {
diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp index e86b3ebd4d..b2adfc3878 100644 --- a/plugins/SendScreenshotPlus/src/CSend.cpp +++ b/plugins/SendScreenshotPlus/src/CSend.cpp @@ -527,7 +527,7 @@ int JSON_Get_(const char* json, size_t jsonlen, const char* variable, const char if(c+2>=jsonend || *++c!=':') break; /// read data ++c; - if(!strcmp(var,needle)){ + if(!mir_strcmp(var,needle)){ int datalen=JSON_ParseData_(&c,jsonend-c,value); if(!datalen) return 0; @@ -691,15 +691,15 @@ int CSend::HTTPFormCreate(NETLIBHTTPREQUEST* nlhr,int requestType,char* url,HTTP const char* mime="application/octet-stream"; const char* fileext=strrchr(filename,'.'); if(fileext){ - if(!strcmp(fileext,".jpg") || !strcmp(fileext,".jpeg") || !strcmp(fileext,".jpe")) + if(!mir_strcmp(fileext,".jpg") || !mir_strcmp(fileext,".jpeg") || !mir_strcmp(fileext,".jpe")) mime="image/jpeg"; - else if(!strcmp(fileext,".bmp")) + else if(!mir_strcmp(fileext,".bmp")) mime="image/bmp"; - else if(!strcmp(fileext,".png")) + else if(!mir_strcmp(fileext,".png")) mime="image/png"; - else if(!strcmp(fileext,".gif")) + else if(!mir_strcmp(fileext,".gif")) mime="image/gif"; - else if(!strcmp(fileext,".tif") || !strcmp(fileext,".tiff")) + else if(!mir_strcmp(fileext,".tif") || !mir_strcmp(fileext,".tiff")) mime="image/tiff"; } HTTPFormAppendData(nlhr,&dataMax,&dataPos,mime,mir_strlen(mime)); diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp index 46b320c020..79f255541e 100644 --- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp +++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp @@ -124,8 +124,8 @@ INT_PTR CSendHTTPServer::MyCallService(const char *name, WPARAM wParam, LPARAM l / * CContactMapping::iterator Contact(_CContactMapping.end()); if ( wParam == m_hContact && ( - (strcmp(name, MS_MSG_SENDMESSAGE)== 0) || - (strcmp(name, "SRMsg/LaunchMessageWindow")== 0) )) + (mir_strcmp(name, MS_MSG_SENDMESSAGE)== 0) || + (mir_strcmp(name, "SRMsg/LaunchMessageWindow")== 0) )) { m_URL= mir_strdup((char*)lParam); return 0; diff --git a/plugins/SimpleStatusMsg/res/resource.rc b/plugins/SimpleStatusMsg/res/resource.rc index 69aac27c27..784edb72ac 100644 --- a/plugins/SimpleStatusMsg/res/resource.rc +++ b/plugins/SimpleStatusMsg/res/resource.rc @@ -313,7 +313,7 @@ BEGIN MENUITEM "?dbsetting(contact,module,setting)", ID__VARIABLES_DBSETTINGCONTACTMODULESETTING
MENUITEM "?txtfile(file,line)", ID__VARIABLES_TXTFILEFILELINE
MENUITEM "?if(condition,true,false)", ID__VARIABLES_IFCONDITIONTRUEFALSE
- MENUITEM "?strcmp(string1,string2)", ID__VARIABLES_STRCMPSTRING1STRING2
+ MENUITEM "?mir_strcmp(string1,string2)", ID__VARIABLES_STRCMPSTRING1STRING2
MENUITEM "?stricmp(string1,string2)", ID__VARIABLES_STRICMPSTRING1STRING2
MENUITEM "?cdate(format)", ID__VARIABLES_CDATEFORMAT
MENUITEM "?ctime(format)", ID__VARIABLES_CTIMEFORMAT
diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index 3aa567406b..9162be6f97 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -974,7 +974,7 @@ INT_PTR ShowStatusMessageDialog(WPARAM wParam, LPARAM lParam) if (!accounts->pa[i]->bIsVisible)
continue;
- if (!strcmp(accounts->pa[i]->szModuleName, (char *)lParam))
+ if (!mir_strcmp(accounts->pa[i]->szModuleName, (char *)lParam))
{
box_data->m_szProto = accounts->pa[i]->szModuleName;
box_data->m_iStatusModes = CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0)&~CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_5, 0);
@@ -1011,7 +1011,7 @@ static int ChangeStatusMessage(WPARAM wParam, LPARAM lParam) // TODO this could be done better
BOOL bOnStartup = FALSE, bGlobalStartupStatus = TRUE;
- if (szProto && !strcmp(szProto, "SimpleStatusMsgGlobalStartupStatus")) {
+ if (szProto && !mir_strcmp(szProto, "SimpleStatusMsgGlobalStartupStatus")) {
szProto = NULL;
bOnStartup = TRUE;
}
@@ -1743,7 +1743,7 @@ static int OnAccListChanged(WPARAM wParam, LPARAM lParam) if (!IsAccountEnabled(accounts->pa[i]))
continue;
- if (!strcmp(accounts->pa[i]->szProtoName, "ICQ"))
+ if (!mir_strcmp(accounts->pa[i]->szProtoName, "ICQ"))
HookProtoEvent(accounts->pa[i]->szModuleName, ME_ICQ_STATUSMSGREQ, OnICQStatusMsgRequest);
accounts->statusFlags |= (CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) & ~CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_5, 0));
diff --git a/plugins/SkypeStatusChange/src/stdafx.h b/plugins/SkypeStatusChange/src/stdafx.h index 8acc6f684e..5a2c296f1e 100644 --- a/plugins/SkypeStatusChange/src/stdafx.h +++ b/plugins/SkypeStatusChange/src/stdafx.h @@ -70,7 +70,7 @@ class COptions OBJLIST<PrevStatus> m_aProtocol2Status;
static int CompareStatuses(const PrevStatus *p1, const PrevStatus *p2)
- { return strcmp(p1->szProto, p2->szProto);
+ { return mir_strcmp(p1->szProto, p2->szProto);
}
public:
diff --git a/plugins/SmileyAdd/src/download.cpp b/plugins/SmileyAdd/src/download.cpp index 0d39bbac4b..e2df1aed45 100644 --- a/plugins/SmileyAdd/src/download.cpp +++ b/plugins/SmileyAdd/src/download.cpp @@ -86,7 +86,7 @@ bool InternetDownloadFile(const char *szUrl, char* szDest, HANDLE &hHttpDwnl) // get the url for the new location and save it to szInfo
// look for the reply header "Location"
for (int i=0; i<nlhrReply->headersCount; i++) {
- if (!strcmp(nlhrReply->headers[i].szName, "Location")) {
+ if (!mir_strcmp(nlhrReply->headers[i].szName, "Location")) {
size_t rlen = 0;
if (nlhrReply->headers[i].szValue[0] == '/') {
const char* szPath;
diff --git a/plugins/SmileyAdd/src/general.cpp b/plugins/SmileyAdd/src/general.cpp index 535eb37d5f..e06fd40f1d 100644 --- a/plugins/SmileyAdd/src/general.cpp +++ b/plugins/SmileyAdd/src/general.cpp @@ -225,7 +225,7 @@ MCONTACT DecodeMetaContact(MCONTACT hContact) bool IsSmileyProto(char* proto)
{
- return proto && strcmp(proto, META_PROTO) && (CallProtoService(proto, PS_GETCAPS, PFLAGNUM_1, 0) & (PF1_IM | PF1_CHAT));
+ return proto && mir_strcmp(proto, META_PROTO) && (CallProtoService(proto, PS_GETCAPS, PFLAGNUM_1, 0) & (PF1_IM | PF1_CHAT));
}
void ReportError(const TCHAR* errmsg)
diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp index 1ab16d58b6..f0e6b79e0d 100644 --- a/plugins/SmileyAdd/src/services.cpp +++ b/plugins/SmileyAdd/src/services.cpp @@ -441,7 +441,7 @@ int DbSettingChanged(WPARAM hContact, LPARAM lParam) if (cws->value.type == DBVT_DELETED)
return 0;
- if (strcmp(cws->szSetting, "Transport") == 0) {
+ if (mir_strcmp(cws->szSetting, "Transport") == 0) {
CMString catname(_T("Standard"));
SmileyCategoryType *smc = g_SmileyCategories.GetSmileyCategory(catname);
if (smc != NULL)
diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp index c4afe2e8d3..41a3be4d18 100644 --- a/plugins/SmileyAdd/src/smileys.cpp +++ b/plugins/SmileyAdd/src/smileys.cpp @@ -849,7 +849,7 @@ void SmileyCategoryListType::AddAccountAsCategory(PROTOACCOUNT *acc, const CMStr if (paths.IsEmpty()){
const char* packnam = acc->szProtoName;
- if (strcmp(packnam, "JABBER") == 0)
+ if (mir_strcmp(packnam, "JABBER") == 0)
packnam = "JGMail";
else if (strstr(packnam, "SIP") != NULL)
packnam = "MSN";
@@ -876,7 +876,7 @@ void SmileyCategoryListType::AddProtoAsCategory(char *acc, const CMString& defau return;
const char* packnam = acc;
- if (strcmp(packnam, "JABBER") == 0)
+ if (mir_strcmp(packnam, "JABBER") == 0)
packnam = "JGMail";
else if (strstr(packnam, "SIP") != NULL)
packnam = "MSN";
diff --git a/plugins/Spamotron/src/bayes.cpp b/plugins/Spamotron/src/bayes.cpp index b1d8720b02..546227a31b 100644 --- a/plugins/Spamotron/src/bayes.cpp +++ b/plugins/Spamotron/src/bayes.cpp @@ -150,8 +150,8 @@ BOOL is_token_valid(char *token) return FALSE;
// skip "www", "com", "org", etc.
- if (!strcmp(token, "www") || !strcmp(token, "com") || !strcmp(token, "org") || !strcmp(token, "edu") ||
- !strcmp(token, "net") || !strcmp(token, "biz") || !strcmp(token, "http") || !strcmp(token, "ftp"))
+ if (!mir_strcmp(token, "www") || !mir_strcmp(token, "com") || !mir_strcmp(token, "org") || !mir_strcmp(token, "edu") ||
+ !mir_strcmp(token, "net") || !mir_strcmp(token, "biz") || !mir_strcmp(token, "http") || !mir_strcmp(token, "ftp"))
return FALSE;
return TRUE;
diff --git a/plugins/SpellChecker/src/dictionary.cpp b/plugins/SpellChecker/src/dictionary.cpp index 64adc2f33a..18689e9756 100644 --- a/plugins/SpellChecker/src/dictionary.cpp +++ b/plugins/SpellChecker/src/dictionary.cpp @@ -533,7 +533,7 @@ public: const char *dic_enc = hunspell->get_dic_encoding(); TCHAR *hwordchars; - if (strcmp(dic_enc, "UTF-8") == 0) { + if (mir_strcmp(dic_enc, "UTF-8") == 0) { codePage = CP_UTF8; diff --git a/plugins/SpellChecker/src/utils.cpp b/plugins/SpellChecker/src/utils.cpp index c784e56b44..557423bd0d 100644 --- a/plugins/SpellChecker/src/utils.cpp +++ b/plugins/SpellChecker/src/utils.cpp @@ -1385,7 +1385,7 @@ int MsgWindowEvent(WPARAM, LPARAM lParam) int IconPressed(WPARAM hContact, LPARAM lParam)
{
StatusIconClickData *sicd = (StatusIconClickData *)lParam;
- if (sicd == NULL || strcmp(sicd->szModule, MODULE_NAME) != 0)
+ if (sicd == NULL || mir_strcmp(sicd->szModule, MODULE_NAME) != 0)
return 0;
if (hContact == NULL)
diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index 155ff045ea..4bf0a94d33 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -140,7 +140,7 @@ int DisablePopup(WPARAM wParam, LPARAM lParam) if (hContact != NULL)
{
char* cp = GetContactProto(hContact);
- if ( !strcmp(cp, "Weather") || !strcmp(cp, "mRadio") )
+ if ( !mir_strcmp(cp, "Weather") || !mir_strcmp(cp, "mRadio") )
return 0;
return 1;
}
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp index 5e08e14a20..761c3913f3 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp @@ -173,7 +173,7 @@ static int ProcessProtoAck(WPARAM wParam, LPARAM lParam) for (int i = 0; i < autoAwaySettings.getCount(); i++) {
TAAAProtoSetting &p = autoAwaySettings[i];
log_debugA("chk: %s", p.szName);
- if (!strcmp(p.szName, ack->szModule)) {
+ if (!mir_strcmp(p.szName, ack->szModule)) {
log_debugA("ack->szModule: %s p.statusChanged: %d", ack->szModule, p.statusChanged);
if (!p.statusChanged)
p.mStatus = TRUE;
diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp index a65e36e22a..80f8ce95fd 100644 --- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp +++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp @@ -282,7 +282,7 @@ static int StatusChange(WPARAM wParam, LPARAM lParam) else { for (int i = 0; i < connectionSettings.getCount(); i++) { TConnectionSettings& cs = connectionSettings[i]; - if (GetStatus(cs) != ID_STATUS_DISABLED && !strcmp(cs.szName, szProto)) + if (GetStatus(cs) != ID_STATUS_DISABLED && !mir_strcmp(cs.szName, szProto)) AssignStatus(&cs, wParam, 0, cs.szMsg); } } @@ -304,7 +304,7 @@ static int CSStatusChange(WPARAM wParam, LPARAM) if ((protoSettings[i]->szName == NULL) || (connectionSettings[j].szName == NULL)) continue; - if (!strcmp(protoSettings[i]->szName, connectionSettings[j].szName)) + if (!mir_strcmp(protoSettings[i]->szName, connectionSettings[j].szName)) if (GetStatus(connectionSettings[j]) != ID_STATUS_DISABLED) AssignStatus(&connectionSettings[j], protoSettings[i]->status, protoSettings[i]->lastStatus, connectionSettings[j].szMsg); } @@ -327,7 +327,7 @@ static int CSStatusChangeEx(WPARAM wParam, LPARAM) for (int j = 0; j < connectionSettings.getCount(); j++) { if ((protoSettings[i]->szName == NULL) || (connectionSettings[j].szName == NULL)) continue; - if (!strcmp(protoSettings[i]->szName, connectionSettings[j].szName)) { + if (!mir_strcmp(protoSettings[i]->szName, connectionSettings[j].szName)) { if (GetStatus(connectionSettings[j]) != ID_STATUS_DISABLED) AssignStatus(&connectionSettings[j], protoSettings[i]->status, protoSettings[i]->lastStatus, protoSettings[i]->szMsg); } @@ -527,7 +527,7 @@ static int ProcessProtoAck(WPARAM, LPARAM lParam) if (ack->type == ACKTYPE_STATUS && ack->result == ACKRESULT_SUCCESS) { for (int i = 0; i < connectionSettings.getCount(); i++) { TConnectionSettings& cs = connectionSettings[i]; - if (!strcmp(cs.szName, ack->szModule)) + if (!mir_strcmp(cs.szName, ack->szModule)) cs.lastStatusAckTime = GetTickCount(); } StartTimer(IDT_PROCESSACK, 0, FALSE); @@ -538,7 +538,7 @@ static int ProcessProtoAck(WPARAM, LPARAM lParam) if (ack->lParam == LOGINERR_OTHERLOCATION) { for (int i = 0; i < connectionSettings.getCount(); i++) { TConnectionSettings& cs = connectionSettings[i]; - if (!strcmp(ack->szModule, cs.szName)) { + if (!mir_strcmp(ack->szModule, cs.szName)) { AssignStatus(&cs, ID_STATUS_OFFLINE, 0, NULL); if (db_get_b(NULL, MODULENAME, SETTING_CNCOTHERLOC, 0)) { StopTimer(IDT_PROCESSACK); @@ -561,7 +561,7 @@ static int ProcessProtoAck(WPARAM, LPARAM lParam) log_infoA("KeepStatus: cancel on login error (%s)", ack->szModule); for (int i = 0; i < connectionSettings.getCount(); i++) { TConnectionSettings& cs = connectionSettings[i]; - if (!strcmp(ack->szModule, cs.szName)) + if (!mir_strcmp(ack->szModule, cs.szName)) AssignStatus(&cs, ID_STATUS_OFFLINE, 0, NULL); } ProcessPopup(KS_CONN_STATE_LOGINERROR, (LPARAM)ack->szModule); @@ -1058,7 +1058,7 @@ INT_PTR EnableProtocolService(WPARAM wParam, LPARAM lParam) int ret = -2; for (int i = 0; i < connectionSettings.getCount(); i++) { TConnectionSettings& cs = connectionSettings[i]; - if (!strcmp(szProto, cs.szName)) { + if (!mir_strcmp(szProto, cs.szName)) { if (wParam) { if (GetStatus(cs) == ID_STATUS_DISABLED) AssignStatus(&cs, CallProtoService(cs.szName, PS_GETSTATUS, 0, 0), 0, NULL); @@ -1083,7 +1083,7 @@ INT_PTR IsProtocolEnabledService(WPARAM, LPARAM lParam) for (int i = 0; i < connectionSettings.getCount(); i++) { TConnectionSettings& cs = connectionSettings[i]; - if (!strcmp(szProto, cs.szName)) + if (!mir_strcmp(szProto, cs.szName)) return GetStatus(cs) != ID_STATUS_DISABLED; } diff --git a/plugins/StatusPlugins/StartupStatus/profiles.cpp b/plugins/StatusPlugins/StartupStatus/profiles.cpp index 7814703f23..4bbe88a28d 100644 --- a/plugins/StatusPlugins/StartupStatus/profiles.cpp +++ b/plugins/StatusPlugins/StartupStatus/profiles.cpp @@ -189,7 +189,7 @@ TCHAR *GetStatusMessage(int profile, char *szProto) DBVARIANT dbv; for ( int i=0; i < pceCount; i++ ) { - if ( (pce[i].profile == profile) && (!strcmp(pce[i].szProto, szProto))) { + if ( (pce[i].profile == profile) && (!mir_strcmp(pce[i].szProto, szProto))) { mir_snprintf(dbSetting, SIZEOF(dbSetting), "%d_%s_%s", profile, szProto, SETTING_PROFILE_STSMSG); if (!db_get_ts(NULL, MODULENAME, dbSetting, &dbv)) { // reload from db pce[i].msg = ( TCHAR* )realloc(pce[i].msg, sizeof(TCHAR)*(mir_tstrlen(dbv.ptszVal)+1)); diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp index 845c8c30b2..aa2bba706e 100644 --- a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp +++ b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp @@ -214,7 +214,7 @@ static int ProcessProtoAck(WPARAM wParam, LPARAM lParam) return 0;
for (int i = 0; i < startupSettings.getCount(); i++) {
- if (!strcmp(ack->szModule, startupSettings[i].szName)) {
+ if (!mir_strcmp(ack->szModule, startupSettings[i].szName)) {
startupSettings[i].szName = "";
log_debugA("StartupStatus: %s overridden by ME_PROTO_ACK, status will not be set", ack->szModule);
}
@@ -238,7 +238,7 @@ static int StatusChange(WPARAM wParam, LPARAM lParam) }
else {
for (int i = 0; i < startupSettings.getCount(); i++) {
- if (!strcmp(startupSettings[i].szName, szProto)) {
+ if (!mir_strcmp(startupSettings[i].szName, szProto)) {
startupSettings[i].szName = "";
log_debugA("StartupStatus: %s overridden by ME_CLIST_STATUSMODECHANGE, status will not be set", szProto);
}
@@ -264,7 +264,7 @@ static int CSStatusChangeEx(WPARAM wParam, LPARAM lParam) if (ps[i]->szName == NULL || startupSettings[j].szName == NULL)
continue;
- if (!strcmp(ps[i]->szName, startupSettings[j].szName)) {
+ if (!mir_strcmp(ps[i]->szName, startupSettings[j].szName)) {
log_debugA("StartupStatus: %s overridden by MS_CS_SETSTATUSEX, status will not be set", ps[i]->szName);
// use a hack to disable this proto
startupSettings[j].szName = "";
diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp index 1ff0f978de..2f4786f33b 100644 --- a/plugins/StatusPlugins/commonstatus.cpp +++ b/plugins/StatusPlugins/commonstatus.cpp @@ -143,7 +143,7 @@ static int equalsGlobalStatus(PROTOCOLSETTINGEX **ps) pstatus = 0;
for (j = 0; j < protoList->getCount(); j++)
- if (!strcmp(protos[i]->szModuleName, ps[j]->szName))
+ if (!mir_strcmp(protos[i]->szModuleName, ps[j]->szName))
pstatus = GetActualStatus(ps[j]);
if (pstatus == 0)
diff --git a/plugins/StopSpamMod/src/stopspam.cpp b/plugins/StopSpamMod/src/stopspam.cpp index 1e6da982db..e83bcd6ea1 100755 --- a/plugins/StopSpamMod/src/stopspam.cpp +++ b/plugins/StopSpamMod/src/stopspam.cpp @@ -342,9 +342,9 @@ MIRANDA_HOOK_EVENT(ME_DB_CONTACT_SETTINGCHANGED, w, l) DBCONTACTWRITESETTING * cws = (DBCONTACTWRITESETTING*)l; // if CList/NotOnList is being deleted then remove answeredSetting - if(strcmp(cws->szModule, "CList")) + if(mir_strcmp(cws->szModule, "CList")) return 0; - if(strcmp(cws->szSetting, "NotOnList")) + if(mir_strcmp(cws->szSetting, "NotOnList")) return 0; if(!cws->value.type) { diff --git a/plugins/StopSpamPlus/src/events.cpp b/plugins/StopSpamPlus/src/events.cpp index 5e51915364..a70e70d0aa 100644 --- a/plugins/StopSpamPlus/src/events.cpp +++ b/plugins/StopSpamPlus/src/events.cpp @@ -191,9 +191,9 @@ MIRANDA_HOOK_EVENT(ME_DB_CONTACT_SETTINGCHANGED, hContact, l) DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)l;
// if CList/NotOnList is being deleted then remove answeredSetting
- if (strcmp(cws->szModule, "CList"))
+ if (mir_strcmp(cws->szModule, "CList"))
return 0;
- if (strcmp(cws->szSetting, "NotOnList"))
+ if (mir_strcmp(cws->szSetting, "NotOnList"))
return 0;
if (!cws->value.type) {
diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp index 885692778c..e6c34b4eb1 100644 --- a/plugins/TabSRMM/src/buttonsbar.cpp +++ b/plugins/TabSRMM/src/buttonsbar.cpp @@ -178,7 +178,7 @@ static INT_PTR CB_GetButtonState(WPARAM wParam, LPARAM lParam) bbdi->bbbFlags = 0; for (int i = 0; i < LButtonsList.getCount(); i++) { CustomButtonData *cbd = LButtonsList[i]; - if (!strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { + if (!mir_strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { realbutton = true; tempCID = cbd->m_dwButtonCID; } @@ -186,7 +186,7 @@ static INT_PTR CB_GetButtonState(WPARAM wParam, LPARAM lParam) if (!realbutton) for (int i = 0; i < RButtonsList.getCount(); i++) { CustomButtonData* cbd = RButtonsList[i]; - if (!strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { + if (!mir_strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { realbutton = true; tempCID = cbd->m_dwButtonCID; } @@ -214,7 +214,7 @@ static INT_PTR CB_SetButtonState(WPARAM wParam, LPARAM lParam) BBButton *bbdi = (BBButton *)lParam; for (int i = 0; i < LButtonsList.getCount(); i++) { CustomButtonData *cbd = LButtonsList[i]; - if (!strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { + if (!mir_strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { realbutton = true; tempCID = cbd->m_dwButtonCID; } @@ -222,7 +222,7 @@ static INT_PTR CB_SetButtonState(WPARAM wParam, LPARAM lParam) if (!realbutton) for (int i = 0; i < RButtonsList.getCount(); i++) { CustomButtonData* cbd = RButtonsList[i]; - if (!strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { + if (!mir_strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { realbutton = true; tempCID = cbd->m_dwButtonCID; } @@ -262,7 +262,7 @@ static INT_PTR CB_RemoveButton(WPARAM, LPARAM lParam) for (int i = LButtonsList.getCount() - 1; i >= 0; i--) { CustomButtonData *cbd = LButtonsList[i]; - if (!strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && cbd->m_dwButtonOrigID == bbdi->dwButtonID) { + if (!mir_strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && cbd->m_dwButtonOrigID == bbdi->dwButtonID) { tempCID = cbd->m_dwButtonCID; dwFlags = cbd->m_bLSided ? BBBF_ISLSIDEBUTTON : BBBF_ISRSIDEBUTTON; LButtonsList.remove(i); @@ -272,7 +272,7 @@ static INT_PTR CB_RemoveButton(WPARAM, LPARAM lParam) if (!tempCID) { for (int i = RButtonsList.getCount() - 1; i >= 0; i--) { CustomButtonData *cbd = RButtonsList[i]; - if (!strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && cbd->m_dwButtonOrigID == bbdi->dwButtonID) { + if (!mir_strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && cbd->m_dwButtonOrigID == bbdi->dwButtonID) { tempCID = cbd->m_dwButtonCID; dwFlags = cbd->m_bLSided ? BBBF_ISLSIDEBUTTON : BBBF_ISRSIDEBUTTON; RButtonsList.remove(i); @@ -299,7 +299,7 @@ static INT_PTR CB_ModifyButton(WPARAM, LPARAM lParam) for (int i = 0; i < LButtonsList.getCount(); i++) { cbd = LButtonsList[i]; - if (!strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { + if (!mir_strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { bFound = true; break; } @@ -308,7 +308,7 @@ static INT_PTR CB_ModifyButton(WPARAM, LPARAM lParam) if (!bFound) { for (int i = 0; i < RButtonsList.getCount(); i++) { cbd = RButtonsList[i]; - if (!strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { + if (!mir_strcmp(cbd->m_pszModuleName, bbdi->pszModuleName) && (cbd->m_dwButtonOrigID == bbdi->dwButtonID)) { bFound = true; break; } @@ -403,13 +403,13 @@ static int SaveTree(HWND hToolBarTree) cbd->m_bIMButton = false; cbd->m_bChatButton = false; - if (cbd->m_bSeparator && !strcmp(cbd->m_pszModuleName, "Tabsrmm_sep")) + if (cbd->m_bSeparator && !mir_strcmp(cbd->m_pszModuleName, "Tabsrmm_sep")) cbd->m_opFlags = BBSF_NTBDESTRUCT; } else { if (!cbd->m_bIMButton && !cbd->m_bChatButton) cbd->m_bIMButton = true; - if (cbd->m_bSeparator && !strcmp(cbd->m_pszModuleName, "Tabsrmm_sep")) { + if (cbd->m_bSeparator && !mir_strcmp(cbd->m_pszModuleName, "Tabsrmm_sep")) { cbd->m_bHidden = 0; cbd->m_opFlags &= ~BBSF_NTBDESTRUCT; ++loc_sepcout; diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp index 7c77f7da97..5becbc5910 100644 --- a/plugins/TabSRMM/src/chat/options.cpp +++ b/plugins/TabSRMM/src/chat/options.cpp @@ -218,7 +218,7 @@ void LoadMsgDlgFont(int section, int i, LOGFONT *lf, COLORREF* colour, char *szM lf->lfQuality = DEFAULT_QUALITY;
lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
mir_snprintf(str, SIZEOF(str), "Font%d", i);
- if ((i == 17 && !strcmp(szMod, CHATFONT_MODULE)) || ((i == 20 || i == 21) && !strcmp(szMod, FONTMODULE))) {
+ if ((i == 17 && !mir_strcmp(szMod, CHATFONT_MODULE)) || ((i == 20 || i == 21) && !mir_strcmp(szMod, FONTMODULE))) {
lf->lfCharSet = SYMBOL_CHARSET;
_tcsncpy_s(lf->lfFaceName, _T("Webdings"), _TRUNCATE);
}
diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp index 12c2b064dd..de67b789b8 100644 --- a/plugins/TabSRMM/src/contactcache.cpp +++ b/plugins/TabSRMM/src/contactcache.cpp @@ -457,7 +457,7 @@ void CContactCache::updateStatusMsg(const char *szKey) MCONTACT hContact = getActiveContact(); - if (szKey == 0 || (szKey && !strcmp("StatusMsg", szKey))) { + if (szKey == 0 || (szKey && !mir_strcmp("StatusMsg", szKey))) { if (m_szStatusMsg) mir_free(m_szStatusMsg); m_szStatusMsg = 0; @@ -465,7 +465,7 @@ void CContactCache::updateStatusMsg(const char *szKey) if (szStatus != 0) m_szStatusMsg = (mir_tstrlen(szStatus) > 0 ? getNormalizedStatusMsg(szStatus) : 0); } - if (szKey == 0 || (szKey && !strcmp("ListeningTo", szKey))) { + if (szKey == 0 || (szKey && !mir_strcmp("ListeningTo", szKey))) { if (m_ListeningInfo) mir_free(m_ListeningInfo); m_ListeningInfo = 0; @@ -473,7 +473,7 @@ void CContactCache::updateStatusMsg(const char *szKey) if (szListeningTo != 0 && *szListeningTo) m_ListeningInfo = szListeningTo.detouch(); } - if (szKey == 0 || (szKey && !strcmp("XStatusMsg", szKey))) { + if (szKey == 0 || (szKey && !mir_strcmp("XStatusMsg", szKey))) { if (m_xStatusMsg) mir_free(m_xStatusMsg); m_xStatusMsg = 0; diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp index 56f4da5747..94fe049ccc 100644 --- a/plugins/TabSRMM/src/controls.cpp +++ b/plugins/TabSRMM/src/controls.cpp @@ -965,7 +965,7 @@ LONG_PTR CALLBACK StatusBarSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR if (sid == NULL)
break;
- if (!strcmp(sid->szModule, MSG_ICON_MODULE)) {
+ if (!mir_strcmp(sid->szModule, MSG_ICON_MODULE)) {
if (sid->dwId == MSG_ICON_SOUND)
mir_sntprintf(wBuf, SIZEOF(wBuf), TranslateT("Sounds are %s. Click to toggle status, hold SHIFT and click to set for all open containers"),
pContainer->dwFlags & CNT_NOSOUND ? TranslateT("disabled") : TranslateT("enabled"));
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index dc427efe51..16cf2b8b38 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -934,7 +934,7 @@ void TSAPI DM_SetDBButtonStates(HWND hwndChild, TWindowData *dat) case DBVT_ASCIIZ: ptrA szValue(db_get_sa(hFinalContact, szModule, szSetting)); if (szValue) - result = !strcmp((char*)buttonItem->bValuePush, szValue); + result = !mir_strcmp((char*)buttonItem->bValuePush, szValue); break; } SendMessage(hWnd, BM_SETCHECK, result, 0); @@ -1846,7 +1846,7 @@ void DrawStatusIcons(TWindowData *dat, HDC hDC, const RECT &rc, int gap) int nIcon = 0; while (StatusIconData *si = Srmm_GetNthIcon(dat->hContact, nIcon++)) { - if (!strcmp(si->szModule, MSG_ICON_MODULE)) { + if (!mir_strcmp(si->szModule, MSG_ICON_MODULE)) { if (si->dwId == MSG_ICON_SOUND) { DrawIconEx(hDC, x, y, PluginConfig.g_buttonBarIcons[ICON_DEFAULT_SOUNDS], cx_icon, cy_icon, 0, NULL, DI_NORMAL); @@ -1900,7 +1900,7 @@ void CheckStatusIconClick(TWindowData *dat, POINT pt, const RECT &rc, int gap, i if (si == NULL) return; - if (!strcmp(si->szModule, MSG_ICON_MODULE)) { + if (!mir_strcmp(si->szModule, MSG_ICON_MODULE)) { if (si->dwId == MSG_ICON_SOUND && code != NM_RCLICK) { if (GetKeyState(VK_SHIFT) & 0x8000) { for (TContainerData *p = pFirstContainer; p; p = p->pNext) { diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 387ae9b138..074835e644 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -378,20 +378,20 @@ int CGlobals::DBSettingChanged(WPARAM hContact, LPARAM lParam) HWND hwnd = M.FindWindow(hContact);
if (hwnd == 0 && hContact != 0) { // we are not interested in this event if there is no open message window/tab
- if (!strcmp(setting, "Status") || !strcmp(setting, "MyHandle") || !strcmp(setting, "Nick") || !strcmp(cws->szModule, SRMSGMOD_T)) {
+ if (!mir_strcmp(setting, "Status") || !mir_strcmp(setting, "MyHandle") || !mir_strcmp(setting, "Nick") || !mir_strcmp(cws->szModule, SRMSGMOD_T)) {
c = CContactCache::getContactCache(hContact);
if (c) {
fChanged = c->updateStatus();
- if (strcmp(setting, "Status"))
+ if (mir_strcmp(setting, "Status"))
c->updateNick();
- if (!strcmp(setting, "isFavorite") || !strcmp(setting, "isRecent"))
+ if (!mir_strcmp(setting, "isFavorite") || !mir_strcmp(setting, "isRecent"))
c->updateFavorite();
}
}
return 0;
}
- if (hContact == 0 && !strcmp("Nick", setting)) {
+ if (hContact == 0 && !mir_strcmp("Nick", setting)) {
M.BroadcastMessage(DM_OWNNICKCHANGED, 0, (LPARAM)cws->szModule);
return 0;
}
@@ -400,8 +400,8 @@ int CGlobals::DBSettingChanged(WPARAM hContact, LPARAM lParam) c = CContactCache::getContactCache(hContact);
if (c) {
szProto = c->getProto();
- if (!strcmp(cws->szModule, SRMSGMOD_T)) { // catch own relevant settings
- if (!strcmp(setting, "isFavorite") || !strcmp(setting, "isRecent"))
+ if (!mir_strcmp(cws->szModule, SRMSGMOD_T)) { // catch own relevant settings
+ if (!mir_strcmp(setting, "isFavorite") || !mir_strcmp(setting, "isRecent"))
c->updateFavorite();
}
}
@@ -426,9 +426,9 @@ int CGlobals::DBSettingChanged(WPARAM hContact, LPARAM lParam) c->updateUIN();
}
}
- else if (!strcmp(setting, "MirVer"))
+ else if (!mir_strcmp(setting, "MirVer"))
PostMessage(hwnd, DM_CLIENTCHANGED, 0, 0);
- else if (!strcmp(setting, "display_uid")) {
+ else if (!mir_strcmp(setting, "display_uid")) {
if (c)
c->updateUIN();
PostMessage(hwnd, DM_UPDATEUIN, 0, 0);
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index 9f487ad79d..f78fdf9b98 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -492,7 +492,7 @@ int CMimAPI::MessageEventAdded(WPARAM hContact, LPARAM hDbEvent) bAllowAutoCreate = true; else { char *szProto = GetContactProto(hContact); - if (szProto && !strcmp(szProto, META_PROTO)) + if (szProto && !mir_strcmp(szProto, META_PROTO)) szProto = GetContactProto(db_mc_getSrmmSub(hContact)); if (szProto) { diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp index b106517789..17913d17c0 100644 --- a/plugins/TabSRMM/src/modplus.cpp +++ b/plugins/TabSRMM/src/modplus.cpp @@ -66,7 +66,7 @@ static int RegisterCustomButton(WPARAM, LPARAM) static int CustomButtonPressed(WPARAM wParam, LPARAM lParam)
{
CustomButtonClickData *cbcd = (CustomButtonClickData *)lParam;
- if (strcmp(cbcd->pszModule, "Tabmodplus") || cbcd->dwButtonId != 1)
+ if (mir_strcmp(cbcd->pszModule, "Tabmodplus") || cbcd->dwButtonId != 1)
return 0;
BBButton bbd = { sizeof(bbd) };
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index d4c9949748..5db596c1c1 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -2982,7 +2982,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case DM_MYAVATARCHANGED:
{
const char *szProto = dat->cache->getActiveProto();
- if (!strcmp((char *)wParam, szProto) && mir_strlen(szProto) == mir_strlen((char *)wParam))
+ if (!mir_strcmp((char *)wParam, szProto) && mir_strlen(szProto) == mir_strlen((char *)wParam))
LoadOwnAvatar(dat);
}
break;
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index aa9965f604..5d68fc5ef5 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -1783,7 +1783,7 @@ void TSAPI GetMyNick(TWindowData *dat) HICON TSAPI MY_GetContactIcon(const TWindowData *dat, LPCSTR szSetting)
{
- int bUseMeta = (szSetting == NULL) ? false : M.GetByte(szSetting, strcmp(szSetting, "MetaiconTab") == 0);
+ int bUseMeta = (szSetting == NULL) ? false : M.GetByte(szSetting, mir_strcmp(szSetting, "MetaiconTab") == 0);
if (bUseMeta)
return LoadSkinnedProtoIcon(dat->cache->getProto(), dat->cache->getStatus());
return LoadSkinnedProtoIcon(dat->cache->getActiveProto(), dat->cache->getActiveStatus());
diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index 4e2248f185..5e83a533bc 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -762,15 +762,15 @@ static int GetIconPackVersion(HMODULE hDLL) if (LoadStringA(hDLL, IDS_IDENTIFY, szIDString, sizeof(szIDString)) == 0)
version = 0;
- else if (!strcmp(szIDString, "__tabSRMM_ICONPACK 1.0__"))
+ else if (!mir_strcmp(szIDString, "__tabSRMM_ICONPACK 1.0__"))
version = 1;
- else if (!strcmp(szIDString, "__tabSRMM_ICONPACK 2.0__"))
+ else if (!mir_strcmp(szIDString, "__tabSRMM_ICONPACK 2.0__"))
version = 2;
- else if (!strcmp(szIDString, "__tabSRMM_ICONPACK 3.0__"))
+ else if (!mir_strcmp(szIDString, "__tabSRMM_ICONPACK 3.0__"))
version = 3;
- else if (!strcmp(szIDString, "__tabSRMM_ICONPACK 3.5__"))
+ else if (!mir_strcmp(szIDString, "__tabSRMM_ICONPACK 3.5__"))
version = 4;
- else if (!strcmp(szIDString, "__tabSRMM_ICONPACK 5.0__"))
+ else if (!mir_strcmp(szIDString, "__tabSRMM_ICONPACK 5.0__"))
version = 5;
if (version < 5)
diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp index f373ca98fa..bcc649242e 100644 --- a/plugins/TabSRMM/src/sendlater.cpp +++ b/plugins/TabSRMM/src/sendlater.cpp @@ -295,7 +295,7 @@ int CSendLater::addJob(const char *szSetting, LPARAM lParam) DBVARIANT dbv = { 0 };
char *szOrig_Utf = 0;
- if (!m_fAvail || !szSetting || !strcmp(szSetting, "count") || mir_strlen(szSetting) < 8)
+ if (!m_fAvail || !szSetting || !mir_strcmp(szSetting, "count") || mir_strlen(szSetting) < 8)
return 0;
if (szSetting[0] != 'S' && szSetting[0] != 'M')
@@ -304,7 +304,7 @@ int CSendLater::addJob(const char *szSetting, LPARAM lParam) // check for possible dupes
for (int i = 0; i < m_sendLaterJobList.getCount(); i++) {
CSendLaterJob *p = m_sendLaterJobList[i];
- if (p->hContact == hContact && !strcmp(p->szId, szSetting))
+ if (p->hContact == hContact && !mir_strcmp(p->szId, szSetting))
return 0;
}
diff --git a/plugins/TabSRMM/src/themeio.cpp b/plugins/TabSRMM/src/themeio.cpp index 84739b881a..fe1f0d3f1a 100644 --- a/plugins/TabSRMM/src/themeio.cpp +++ b/plugins/TabSRMM/src/themeio.cpp @@ -144,7 +144,7 @@ static void TSAPI LoadLogfontFromINI(int i, char *szKey, LOGFONTA *lf, COLORREF * filter out font attributes from the message input area font
* (can be disabled by db tweak)
*/
- if (!strcmp(szKey, "Font16") && M.GetByte("inputFontFix", 1) == 1) {
+ if (!mir_strcmp(szKey, "Font16") && M.GetByte("inputFontFix", 1) == 1) {
lf->lfWeight = FW_NORMAL;
lf->lfItalic = 0;
lf->lfUnderline = 0;
@@ -391,7 +391,7 @@ void TSAPI ReadThemeFromINI(const TCHAR *szIniFilenameT, TContainerData *dat, in GetPrivateProfileStringA("Templates", TemplateNames[i], "[undef]", szTemplateBuffer, TEMPLATE_LENGTH * 3, szIniFilename);
- if (strcmp(szTemplateBuffer, "[undef]")) {
+ if (mir_strcmp(szTemplateBuffer, "[undef]")) {
if (dat == 0)
db_set_utf(NULL, TEMPLATES_MODULE, TemplateNames[i], szTemplateBuffer);
decoded = mir_utf8decodeW(szTemplateBuffer);
@@ -404,7 +404,7 @@ void TSAPI ReadThemeFromINI(const TCHAR *szIniFilenameT, TContainerData *dat, in GetPrivateProfileStringA("RTLTemplates", TemplateNames[i], "[undef]", szTemplateBuffer, TEMPLATE_LENGTH * 3, szIniFilename);
- if (strcmp(szTemplateBuffer, "[undef]")) {
+ if (mir_strcmp(szTemplateBuffer, "[undef]")) {
if (dat == 0)
db_set_utf(NULL, RTLTEMPLATES_MODULE, TemplateNames[i], szTemplateBuffer);
decoded = mir_utf8decodeW(szTemplateBuffer);
diff --git a/plugins/TipperYM/src/mir_smileys.cpp b/plugins/TipperYM/src/mir_smileys.cpp index 53cc09fe46..a6ac7e8cd9 100644 --- a/plugins/TipperYM/src/mir_smileys.cpp +++ b/plugins/TipperYM/src/mir_smileys.cpp @@ -315,7 +315,7 @@ SortedList *ReplaceSmileys(const TCHAR *text, int text_size, const char *protoco char smileyProto[64];
if (protocol == NULL)
strncpy(smileyProto, "tipper", sizeof(smileyProto) - 1);
- else if (strcmp(protocol, META_PROTO) == 0)
+ else if (mir_strcmp(protocol, META_PROTO) == 0)
strncpy(smileyProto, "tipper", sizeof(smileyProto) - 1);
else
strncpy(smileyProto, protocol, sizeof(smileyProto) - 1);
diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp index 495957a6ae..f20efb465b 100644 --- a/plugins/TipperYM/src/popwin.cpp +++ b/plugins/TipperYM/src/popwin.cpp @@ -337,7 +337,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa int iXstatus = db_get_b(pwd->hContact, szProto, "XStatusId", 0); if (iXstatus) { char szIconProto[64]; - if (strcmp(szProto, META_PROTO) != 0) + if (mir_strcmp(szProto, META_PROTO) != 0) strncpy(szIconProto, szProto, sizeof(szIconProto) - 1); else if (!db_get_s(pwd->hContact, szProto, "XStatusProto", &dbv)) { strncpy(szIconProto, dbv.pszVal, sizeof(szIconProto) - 1); diff --git a/plugins/TipperYM/src/preset_items.cpp b/plugins/TipperYM/src/preset_items.cpp index ba5f179f4d..d6b14e8f38 100644 --- a/plugins/TipperYM/src/preset_items.cpp +++ b/plugins/TipperYM/src/preset_items.cpp @@ -105,7 +105,7 @@ PRESETITEM *GetPresetItemByName(char *szName) {
for (int i = 0; presetItems[i].szID; i++)
{
- if (strcmp(presetItems[i].szID, szName) == 0)
+ if (mir_strcmp(presetItems[i].szID, szName) == 0)
return &presetItems[i];
}
@@ -117,7 +117,7 @@ PRESETSUBST *GetPresetSubstByName(char *szName) if (!szName) return NULL;
for (int i = 0; presetSubsts[i].szID; i++)
{
- if (strcmp(presetSubsts[i].szID, szName) == 0)
+ if (mir_strcmp(presetSubsts[i].szID, szName) == 0)
return &presetSubsts[i];
}
diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp index 31fa26a4a3..7758845d27 100644 --- a/plugins/TipperYM/src/subst.cpp +++ b/plugins/TipperYM/src/subst.cpp @@ -217,7 +217,7 @@ TCHAR* GetStatusMessageText(MCONTACT hContact) char *szProto = GetContactProto(hContact); if (szProto) { - if (!strcmp(szProto, META_PROTO)) + if (!mir_strcmp(szProto, META_PROTO)) hContact = db_mc_getMostOnline(hContact); else { WORD wStatus = (int)CallProtoService(szProto, PS_GETSTATUS, 0, 0); @@ -360,7 +360,7 @@ bool GetSysSubstText(MCONTACT hContact, TCHAR *swzRawSpec, TCHAR *buff, int buff MCONTACT hTmpContact = hContact; char *szProto = GetContactProto(hContact); - if (szProto && !strcmp(szProto, META_PROTO)) { + if (szProto && !mir_strcmp(szProto, META_PROTO)) { iNumber = db_mc_getSubCount(hContact); hTmpContact = db_mc_getSub(hContact, 0); } diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp index ca273e1f13..8ae1171ed2 100644 --- a/plugins/TipperYM/src/tipper.cpp +++ b/plugins/TipperYM/src/tipper.cpp @@ -95,7 +95,7 @@ int ReloadFont(WPARAM wParam, LPARAM lParam) int SettingChanged(WPARAM hContact, LPARAM lParam)
{
DBCONTACTWRITESETTING *dcws = (DBCONTACTWRITESETTING *)lParam;
- if (strcmp(dcws->szModule, "CList") != 0 || strcmp(dcws->szSetting, "State") != 0)
+ if (mir_strcmp(dcws->szModule, "CList") != 0 || mir_strcmp(dcws->szSetting, "State") != 0)
return 0;
// clist hiding
diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp index 85a0473c92..87397c2678 100644 --- a/plugins/TipperYM/src/translations.cpp +++ b/plugins/TipperYM/src/translations.cpp @@ -206,7 +206,7 @@ TCHAR *WordToCountry(MCONTACT hContact, const char *szModuleName, const char *sz WORD cid = (WORD)db_get_w(hContact, szModuleName, szSettingName, (WORD)-1);
if (cid != (WORD)-1 && ServiceExists(MS_UTILS_GETCOUNTRYBYNUMBER) && (szCountryName = (char *)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, cid, 0)) != 0)
{
- if (strcmp(szCountryName, "Unknown") == 0)
+ if (mir_strcmp(szCountryName, "Unknown") == 0)
return 0;
a2t(szCountryName, buff, bufflen);
buff[bufflen - 1] = 0;
diff --git a/plugins/TopToolBar/src/InternalButtons.cpp b/plugins/TopToolBar/src/InternalButtons.cpp index 2ba32960d6..943950fe3d 100644 --- a/plugins/TopToolBar/src/InternalButtons.cpp +++ b/plugins/TopToolBar/src/InternalButtons.cpp @@ -43,18 +43,18 @@ int OnSettingChanging(WPARAM hContact, LPARAM lParam) if (hContact != 0 || dbcws == NULL)
return 0;
- if (!strcmp(dbcws->szModule, "CList")) {
- if (!strcmp(dbcws->szSetting, "HideOffline"))
+ if (!mir_strcmp(dbcws->szModule, "CList")) {
+ if (!mir_strcmp(dbcws->szSetting, "HideOffline"))
CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)stdButtons[INDEX_OFFLINE].hButton, dbcws->value.bVal ? 0 : TTBST_PUSHED);
- else if (!strcmp(dbcws->szSetting, "UseGroups"))
+ else if (!mir_strcmp(dbcws->szSetting, "UseGroups"))
CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)stdButtons[INDEX_GROUPS].hButton, dbcws->value.bVal ? TTBST_PUSHED : 0);
}
- else if (!strcmp(dbcws->szModule, "Skin")) {
- if (!strcmp(dbcws->szSetting, "UseSound"))
+ else if (!mir_strcmp(dbcws->szModule, "Skin")) {
+ if (!mir_strcmp(dbcws->szSetting, "UseSound"))
CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)stdButtons[INDEX_SOUNDS].hButton, dbcws->value.bVal ? TTBST_PUSHED : 0);
}
- else if (!strcmp(dbcws->szModule, "MetaContacts")) {
- if (!strcmp(dbcws->szSetting, "Enabled"))
+ else if (!mir_strcmp(dbcws->szModule, "MetaContacts")) {
+ if (!mir_strcmp(dbcws->szSetting, "Enabled"))
CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)stdButtons[INDEX_META].hButton, dbcws->value.bVal ? TTBST_PUSHED : 0);
}
diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp index 724dba4b04..ab630faea8 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.cpp +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -357,7 +357,7 @@ int TrafficRecv(WPARAM wParam,LPARAM lParam) if (nln->result > 0)
for (i = 0; i < NumberOfAccounts; i++)
- if (!strcmp(ProtoList[i].name, nlu->szSettingsModule))
+ if (!mir_strcmp(ProtoList[i].name, nlu->szSettingsModule))
InterlockedExchangeAdd(&ProtoList[i].AllStatistics[ProtoList[i].NumberOfRecords-1].Incoming, nln->result);
return 0;
}
@@ -370,7 +370,7 @@ int TrafficSend(WPARAM wParam,LPARAM lParam) if (nln->result > 0)
for (i = 0; i < NumberOfAccounts; i++)
- if (!strcmp(ProtoList[i].name, nlu->szSettingsModule))
+ if (!mir_strcmp(ProtoList[i].name, nlu->szSettingsModule))
InterlockedExchangeAdd(&ProtoList[i].AllStatistics[ProtoList[i].NumberOfRecords-1].Outgoing, nln->result);
return 0;
}
@@ -1225,7 +1225,7 @@ int ProtocolAckHook(WPARAM wParam,LPARAM lParam) for (i = 0; i < NumberOfAccounts; i++)
{
if (!ProtoList[i].name) continue;
- if (!strcmp(ProtoList[i].name, pAck->szModule))
+ if (!mir_strcmp(ProtoList[i].name, pAck->szModule))
{
ProtocolIsOffLine(i);
break;
@@ -1237,7 +1237,7 @@ int ProtocolAckHook(WPARAM wParam,LPARAM lParam) if ((pAck->lParam >= ID_STATUS_ONLINE) && (pAck->lParam <= ID_STATUS_OUTTOLUNCH))
{
for (i = 0; i < NumberOfAccounts; i++)
- if (!strcmp(ProtoList[i].name, pAck->szModule))
+ if (!mir_strcmp(ProtoList[i].name, pAck->szModule))
{
ProtocolIsOnLine(i);
break;
@@ -1313,7 +1313,7 @@ int OnAccountsListChange(WPARAM wParam, LPARAM lParam) case PRAC_CHANGED:
case PRAC_CHECKED:
for (i = 0; i < NumberOfAccounts; i++)
- if (!strcmp(acc->szModuleName, ProtoList[i].name))
+ if (!mir_strcmp(acc->szModuleName, ProtoList[i].name))
ProtoList[i].Enabled = acc->bIsEnabled;
break;
}
diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h index 940553dac9..2348a06b5d 100644 --- a/plugins/UserInfoEx/src/commonheaders.h +++ b/plugins/UserInfoEx/src/commonheaders.h @@ -89,7 +89,7 @@ using namespace std; * UserInfoEx plugin includes and macros
***********************************************************************************************************/
-#pragma intrinsic(memcmp, memcpy, memset, strcmp, mir_strlen)
+#pragma intrinsic(memcmp, memcpy, memset, mir_strcmp, mir_strlen)
#ifndef MIR_OK
#define MIR_OK 0 // success value of a miranda service function
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index 0e409bc24a..d73bcd334a 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -498,7 +498,7 @@ int CExImContactXML::LoadXmlElemnt(TiXmlElement *xContact) MIR_FREE(_pszUIDKey);
// is contact a metacontact
- if (_pszAMPro && !strcmp(_pszAMPro, META_PROTO)) {
+ if (_pszAMPro && !mir_strcmp(_pszAMPro, META_PROTO)) {
TiXmlElement *xSub;
proto(META_PROTO);
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp index 39ffd48918..8dff63f5d4 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp @@ -1160,13 +1160,13 @@ BYTE CVCardFileVCF::Import() }
switch (*szEnt) {
case 'A':
- if (!strcmp(szEnt, "ABOUT")) {
+ if (!mir_strcmp(szEnt, "ABOUT")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_ABOUT);
continue;
}
- if (!strcmp(szEnt, "ADR")) {
+ if (!mir_strcmp(szEnt, "ADR")) {
if (!pszParam) continue;
- if (!strcmp(pszParam, "HOME")) {
+ if (!mir_strcmp(pszParam, "HOME")) {
_clVal.GetTokenFirst(';', NULL);
_clVal.GetTokenNext(';', NULL);
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_STREET, ';');
@@ -1176,7 +1176,7 @@ BYTE CVCardFileVCF::Import() _clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_COUNTRY, ';');
continue;
}
- if (!strcmp(pszParam, "WORK")) {
+ if (!mir_strcmp(pszParam, "WORK")) {
_clVal.GetTokenFirst(';', NULL);
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_COMPANY_OFFICE, ';');
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_COMPANY_STREET, ';');
@@ -1186,7 +1186,7 @@ BYTE CVCardFileVCF::Import() _clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_COMPANY_COUNTRY, ';');
continue;
}
- if (!strcmp(pszParam, "POSTAL")) {
+ if (!mir_strcmp(pszParam, "POSTAL")) {
_clVal.GetTokenFirst(';', NULL);
_clVal.GetTokenNext(';', NULL);
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_ORIGIN_STREET, ';');
@@ -1199,7 +1199,7 @@ BYTE CVCardFileVCF::Import() continue;
case 'B':
- if (!strcmp(szEnt, "BDAY")) {
+ if (!mir_strcmp(szEnt, "BDAY")) {
if (_clVal.GetLength() == 8) {
CHAR buf[5];
@@ -1217,7 +1217,7 @@ BYTE CVCardFileVCF::Import() continue;
case 'E':
- if (!strcmp(szEnt, "EMAIL")) {
+ if (!mir_strcmp(szEnt, "EMAIL")) {
if (!pszParam || !strstr(pszParam, "intERNET"))
continue;
if (strstr(pszParam, "PREF")) {
@@ -1236,7 +1236,7 @@ BYTE CVCardFileVCF::Import() continue;
/*
case 'I':
- if (!strcmp(szEnt, "IM")) {
+ if (!mir_strcmp(szEnt, "IM")) {
LPSTR pszModule, pszSetting;
if (pszParam && (pszModule = strtok(pszParam, DELIM)) && (pszSetting = strtok(NULL, DELIM)))
@@ -1245,7 +1245,7 @@ BYTE CVCardFileVCF::Import() continue;
*/
case 'N':
- if (!strcmp(szEnt, "N")) {
+ if (!mir_strcmp(szEnt, "N")) {
_clVal.DBWriteTokenFirst(_hContact, USERINFO, SET_CONTACT_LASTNAME, ';');
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_FIRSTNAME, ';');
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_SECONDNAME, ';');
@@ -1253,58 +1253,58 @@ BYTE CVCardFileVCF::Import() _clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_PREFIX, ';');
continue;
}
- if (!strcmp(szEnt, "NICKNAME")) {
+ if (!mir_strcmp(szEnt, "NICKNAME")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_NICK);
continue;
}
- if (!strcmp(szEnt, "NOTE")) {
+ if (!mir_strcmp(szEnt, "NOTE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_MYNOTES);
}
continue;
case 'O':
- if (!strcmp(szEnt, "ORG")) {
+ if (!mir_strcmp(szEnt, "ORG")) {
_clVal.DBWriteTokenFirst(_hContact, USERINFO, SET_CONTACT_COMPANY, ';');
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_COMPANY_DEPARTMENT, ';');
}
continue;
case 'R':
- if (!strcmp(szEnt, "ROLE")) {
+ if (!mir_strcmp(szEnt, "ROLE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_OCCUPATION);
}
continue;
case 'T':
- if (!strcmp(szEnt, "TITLE")) {
+ if (!mir_strcmp(szEnt, "TITLE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_POSITION);
continue;
}
- if (!strcmp(szEnt, "TEL")) {
+ if (!mir_strcmp(szEnt, "TEL")) {
if (!pszParam) continue;
- if (!strcmp(pszParam, "HOME;VOICE")) {
+ if (!mir_strcmp(pszParam, "HOME;VOICE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_PHONE);
continue;
}
- if (!strcmp(pszParam, "HOME;FAX")) {
+ if (!mir_strcmp(pszParam, "HOME;FAX")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_FAX);
continue;
}
- if (!strcmp(pszParam, "CELL;VOICE")) {
+ if (!mir_strcmp(pszParam, "CELL;VOICE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_CELLULAR);
continue;
}
- if (!strcmp(pszParam, "WORK;VOICE")) {
+ if (!mir_strcmp(pszParam, "WORK;VOICE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_PHONE);
continue;
}
- if (!strcmp(pszParam, "WORK;FAX")) {
+ if (!mir_strcmp(pszParam, "WORK;FAX")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_FAX);
continue;
}
- if (!strcmp(pszParam, "PAGER;VOICE")) {
+ if (!mir_strcmp(pszParam, "PAGER;VOICE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_CELLULAR);
continue;
}
@@ -1312,25 +1312,25 @@ BYTE CVCardFileVCF::Import() continue;
case 'U':
- if (!strcmp(szEnt, "URL")) {
+ if (!mir_strcmp(szEnt, "URL")) {
if (!pszParam) continue;
- if (!strcmp(pszParam, "HOME")) {
+ if (!mir_strcmp(pszParam, "HOME")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_HOMEPAGE);
continue;
}
- if (!strcmp(pszParam, "WORK")) {
+ if (!mir_strcmp(pszParam, "WORK")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_HOMEPAGE);
}
}
continue;
case 'X':
- if (!strcmp(szEnt, "X-WAB-GENDER")) {
- if (!strcmp(_clVal.GetBuffer(), "1"))
+ if (!mir_strcmp(szEnt, "X-WAB-GENDER")) {
+ if (!mir_strcmp(_clVal.GetBuffer(), "1"))
db_set_b(_hContact, USERINFO, SET_CONTACT_GENDER, 'F');
- else if (!strcmp(_clVal.GetBuffer(), "2"))
+ else if (!mir_strcmp(_clVal.GetBuffer(), "2"))
db_set_b(_hContact, USERINFO, SET_CONTACT_GENDER, 'M');
}
continue;
diff --git a/plugins/UserInfoEx/src/ex_import/tinystr.h b/plugins/UserInfoEx/src/ex_import/tinystr.h index 9c66f2b7e9..2658a4f639 100644 --- a/plugins/UserInfoEx/src/ex_import/tinystr.h +++ b/plugins/UserInfoEx/src/ex_import/tinystr.h @@ -262,11 +262,11 @@ class TiXmlString inline bool operator == (const TiXmlString & a, const TiXmlString & b) { return (a.length() == b.length()) // optimization on some platforms - && (strcmp(a.c_str(), b.c_str()) == 0); // actual compare + && (mir_strcmp(a.c_str(), b.c_str()) == 0); // actual compare } inline bool operator < (const TiXmlString & a, const TiXmlString & b) { - return strcmp(a.c_str(), b.c_str()) < 0; + return mir_strcmp(a.c_str(), b.c_str()) < 0; } inline bool operator != (const TiXmlString & a, const TiXmlString & b) { return !(a == b); } @@ -274,7 +274,7 @@ inline bool operator > (const TiXmlString & a, const TiXmlString & b) { return b inline bool operator <= (const TiXmlString & a, const TiXmlString & b) { return !(b < a); } inline bool operator >= (const TiXmlString & a, const TiXmlString & b) { return !(a < b); } -inline bool operator == (const TiXmlString & a, const char* b) { return strcmp(a.c_str(), b) == 0; } +inline bool operator == (const TiXmlString & a, const char* b) { return mir_strcmp(a.c_str(), b) == 0; } inline bool operator == (const char* a, const TiXmlString & b) { return b == a; } inline bool operator != (const TiXmlString & a, const char* b) { return !(a == b); } inline bool operator != (const char* a, const TiXmlString & b) { return !(b == a); } diff --git a/plugins/UserInfoEx/src/ex_import/tinyxml.cpp b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp index 2c815d536c..2692a3196f 100644 --- a/plugins/UserInfoEx/src/ex_import/tinyxml.cpp +++ b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp @@ -357,7 +357,7 @@ const TiXmlNode* TiXmlNode::FirstChild(const char * _value) const const TiXmlNode* node;
for (node = firstChild; node; node = node->next)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -369,7 +369,7 @@ TiXmlNode* TiXmlNode::FirstChild(const char * _value) TiXmlNode* node;
for (node = firstChild; node; node = node->next)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -381,7 +381,7 @@ const TiXmlNode* TiXmlNode::LastChild(const char * _value) const const TiXmlNode* node;
for (node = lastChild; node; node = node->prev)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -392,7 +392,7 @@ TiXmlNode* TiXmlNode::LastChild(const char * _value) TiXmlNode* node;
for (node = lastChild; node; node = node->prev)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -455,7 +455,7 @@ const TiXmlNode* TiXmlNode::NextSibling(const char * _value) const const TiXmlNode* node;
for (node = next; node; node = node->next)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -466,7 +466,7 @@ TiXmlNode* TiXmlNode::NextSibling(const char * _value) TiXmlNode* node;
for (node = next; node; node = node->next)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -477,7 +477,7 @@ const TiXmlNode* TiXmlNode::PreviousSibling(const char * _value) const const TiXmlNode* node;
for (node = prev; node; node = node->prev)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -488,7 +488,7 @@ TiXmlNode* TiXmlNode::PreviousSibling(const char * _value) TiXmlNode* node;
for (node = prev; node; node = node->prev)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp index 972e9790ba..59e8db3473 100644 --- a/plugins/UserInfoEx/src/mir_db.cpp +++ b/plugins/UserInfoEx/src/mir_db.cpp @@ -732,7 +732,7 @@ int CEnumList::CompareProc(LPCSTR p1, LPCSTR p2) {
if (p1) {
if (p2)
- return strcmp(p1, p2);
+ return mir_strcmp(p1, p2);
return 1;
}
diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp index edeb7e472c..741ceb6fd7 100644 --- a/plugins/UserInfoEx/src/psp_profile.cpp +++ b/plugins/UserInfoEx/src/psp_profile.cpp @@ -527,7 +527,7 @@ static int ProfileList_AddItemlistFromDB( continue;
break;
case DBVT_ASCIIZ:
- if (strcmp(dbvCat.pszVal, idList[j].pszText))
+ if (mir_strcmp(dbvCat.pszVal, idList[j].pszText))
continue;
break;
}
diff --git a/plugins/UserInfoEx/src/svc_constants.cpp b/plugins/UserInfoEx/src/svc_constants.cpp index 9cd745643a..240d6ae1b8 100644 --- a/plugins/UserInfoEx/src/svc_constants.cpp +++ b/plugins/UserInfoEx/src/svc_constants.cpp @@ -277,7 +277,7 @@ static void SvcConstantsTranslateList(LPIDSTRLIST pList, UINT nListCount/*, Sort pList[i].ptszTranslated = (LPTSTR)CallService(MS_LANGPACK_PCHARTOTCHAR, 0, (LPARAM)pList[i].pszText);
}
// Ignore last item, if it is a "Other" item.
- if (!strcmp(pList[nListCount-1].pszText, LPGEN("Other"))) nListCount--;
+ if (!mir_strcmp(pList[nListCount-1].pszText, LPGEN("Other"))) nListCount--;
// Sort list according translated text and ignore first item.
qsort(pList+1, nListCount-1, sizeof(pList[0]),
diff --git a/plugins/UserInfoEx/src/svc_phone.cpp b/plugins/UserInfoEx/src/svc_phone.cpp index f43e0a48c4..130976526b 100644 --- a/plugins/UserInfoEx/src/svc_phone.cpp +++ b/plugins/UserInfoEx/src/svc_phone.cpp @@ -109,10 +109,10 @@ static int OnContactSettingChanged(MCONTACT hContact, DBCONTACTWRITESETTING* pdb {
if (hContact && pdbcws && pdbcws->szSetting &&
((pdbcws->value.type & DBVTF_VARIABLELENGTH) || (pdbcws->value.type == DBVT_DELETED)) &&
- (!strcmp(pdbcws->szSetting, SET_CONTACT_PHONE) ||
- !strcmp(pdbcws->szSetting, SET_CONTACT_CELLULAR) ||
- !strcmp(pdbcws->szSetting, SET_CONTACT_COMPANY_PHONE) ||
- !strcmp(pdbcws->szSetting, SET_CONTACT_COMPANY_CELLULAR) ||
+ (!mir_strcmp(pdbcws->szSetting, SET_CONTACT_PHONE) ||
+ !mir_strcmp(pdbcws->szSetting, SET_CONTACT_CELLULAR) ||
+ !mir_strcmp(pdbcws->szSetting, SET_CONTACT_COMPANY_PHONE) ||
+ !mir_strcmp(pdbcws->szSetting, SET_CONTACT_COMPANY_CELLULAR) ||
!strncmp(pdbcws->szSetting, "MyPhone0", 8)))
OnCListApplyIcons(hContact, 0);
diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index 04f54a39b7..4c0f839e5a 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -657,7 +657,7 @@ static int OnContactSettingChanged(MCONTACT hContact, DBCONTACTWRITESETTING* pdb CEvent evt;
MTime now;
now.GetLocalTime();
- if (!strcmp(pdbcws->szModule, SvcReminderGetMyBirthdayModule())) {
+ if (!mir_strcmp(pdbcws->szModule, SvcReminderGetMyBirthdayModule())) {
WORD LastAnswer = IDNONE;
CheckContact(hContact, now, evt, FALSE, &LastAnswer);
}
diff --git a/plugins/Variables/docs/Variables.txt b/plugins/Variables/docs/Variables.txt index af25cbf0fa..2e067ee1e7 100644 --- a/plugins/Variables/docs/Variables.txt +++ b/plugins/Variables/docs/Variables.txt @@ -305,7 +305,7 @@ Generates a for-loop; w will be initialized, x specifies the condition on which y will be executed and z will be shown.
Example:
-!for(!puts(i,0),!not(!strcmp(!get(i),3)),!puts(i,!add(!get(i),1)),i=!get(i)!crlf())
+!for(!puts(i,0),!not(!mir_strcmp(!get(i),3)),!puts(i,!add(!get(i),1)),i=!get(i)!crlf())
--- Notes ---
@@ -343,7 +343,7 @@ Example: # get the number of contacts with the display name "Marley"
!puts(count,!ccount(`Marley`,display))
# loop through these contacts, for each of them, show the e-mail address
-!for(!puts(n,0),!not(!strcmp(!get(n),!get(count))),!puts(n,!add(!get(n),1)),!cinfo(!contact(`Marley`,`display`,!add(!get(n),1)),email))
+!for(!puts(n,0),!not(!mir_strcmp(!get(n),!get(count))),!puts(n,!add(!get(n),1)),!cinfo(!contact(`Marley`,`display`,!add(!get(n),1)),email))
In case the z argument is used, y can be any property of the cinfo
function. Z can be 'r' to get a random contact.
diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp index cbb70481bc..40b0bf6f3c 100644 --- a/plugins/Variables/src/contact.cpp +++ b/plugins/Variables/src/contact.cpp @@ -369,13 +369,13 @@ static int contactSettingChanged(WPARAM hContact, LPARAM lParam) continue;
char *uid = (char*)CallProtoService(szProto,PS_GETCAPS,PFLAG_UNIQUEIDSETTING,0);
- if (((!strcmp(dbw->szSetting, "Nick")) && (cce[i].flags & CI_NICK)) ||
- ((!strcmp(dbw->szSetting, "FirstName")) && (cce[i].flags & CI_FIRSTNAME)) ||
- ((!strcmp(dbw->szSetting, "LastName")) && (cce[i].flags & CI_LASTNAME)) ||
- ((!strcmp(dbw->szSetting, "e-mail")) && (cce[i].flags & CI_EMAIL)) ||
- ((!strcmp(dbw->szSetting, "MyHandle")) && (cce[i].flags & CI_LISTNAME)) ||
+ if (((!mir_strcmp(dbw->szSetting, "Nick")) && (cce[i].flags & CI_NICK)) ||
+ ((!mir_strcmp(dbw->szSetting, "FirstName")) && (cce[i].flags & CI_FIRSTNAME)) ||
+ ((!mir_strcmp(dbw->szSetting, "LastName")) && (cce[i].flags & CI_LASTNAME)) ||
+ ((!mir_strcmp(dbw->szSetting, "e-mail")) && (cce[i].flags & CI_EMAIL)) ||
+ ((!mir_strcmp(dbw->szSetting, "MyHandle")) && (cce[i].flags & CI_LISTNAME)) ||
(cce[i].flags & CI_CNFINFO) != 0 || // lazy; always invalidate CNF info cache entries
- (( ((INT_PTR)uid != CALLSERVICE_NOTFOUND) && (uid != NULL)) && (!strcmp(dbw->szSetting, uid)) && (cce[i].flags & CI_UNIQUEID)))
+ (( ((INT_PTR)uid != CALLSERVICE_NOTFOUND) && (uid != NULL)) && (!mir_strcmp(dbw->szSetting, uid)) && (cce[i].flags & CI_UNIQUEID)))
{
/* remove from cache */
mir_free(cce[i].tszContact);
diff --git a/plugins/Variables/src/parse_str.h b/plugins/Variables/src/parse_str.h index cab3c017bc..05f14d81c2 100644 --- a/plugins/Variables/src/parse_str.h +++ b/plugins/Variables/src/parse_str.h @@ -43,7 +43,7 @@ #define MIR_STRCHR _T("strchr")
#define MIR_STRRCHR _T("strrchr")
#define MIR_STRSTR _T("strstr")
-#define MIR_STRCMP _T("strcmp")
+#define MIR_STRCMP _T("mir_strcmp")
#define MIR_STRNCMP _T("strncmp")
#define MIR_STRMCMP _T("strmcmp")
#define MIR_STRICMP _T("stricmp")
diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp index 1949517426..abe63173db 100644 --- a/plugins/Weather/src/weather_contacts.cpp +++ b/plugins/Weather/src/weather_contacts.cpp @@ -477,5 +477,5 @@ int ContactDeleted(WPARAM wParam, LPARAM lParam) BOOL IsMyContact(MCONTACT hContact)
{
const char* szProto = GetContactProto(hContact);
- return szProto != NULL && strcmp(WEATHERPROTONAME, szProto) == 0;
+ return szProto != NULL && mir_strcmp(WEATHERPROTONAME, szProto) == 0;
}
diff --git a/plugins/Weather/src/weather_data.cpp b/plugins/Weather/src/weather_data.cpp index deb04358ec..1908fe3115 100644 --- a/plugins/Weather/src/weather_data.cpp +++ b/plugins/Weather/src/weather_data.cpp @@ -448,7 +448,7 @@ void DBDataManage(MCONTACT hContact, WORD Mode, WPARAM wParam, LPARAM lParam) case WDBM_DETAILDISPLAY:
// skip the "WeatherInfo" variable
- if (!strcmp(szSetting, "WeatherInfo") || !strcmp(szSetting, "Ignore") || szSetting[0] == '#')
+ if (!mir_strcmp(szSetting, "WeatherInfo") || !mir_strcmp(szSetting, "Ignore") || szSetting[0] == '#')
continue;
HWND hList = GetDlgItem((HWND)wParam, IDC_DATALIST);
diff --git a/plugins/Weather/src/weather_icons.cpp b/plugins/Weather/src/weather_icons.cpp index 5cc7f5b907..85884aa983 100644 --- a/plugins/Weather/src/weather_icons.cpp +++ b/plugins/Weather/src/weather_icons.cpp @@ -52,7 +52,7 @@ HICON LoadIconEx(const char* name, BOOL big) HANDLE GetIconHandle(const char* name)
{
for (int i=0; i < SIZEOF(iconList); i++)
- if (strcmp(iconList[i].szName, name) == 0)
+ if (mir_strcmp(iconList[i].szName, name) == 0)
return iconList[i].hIcolib;
return NULL;
diff --git a/plugins/Weather/src/weather_ini.cpp b/plugins/Weather/src/weather_ini.cpp index 7c69dc38f4..0d0678fd15 100644 --- a/plugins/Weather/src/weather_ini.cpp +++ b/plugins/Weather/src/weather_ini.cpp @@ -257,19 +257,19 @@ void LoadStationData(TCHAR *pszFile, TCHAR *pszShortFile, WIDATA *Data) TrimString(Line);
// make sure it is a valid weather protocol ini file
- if ( !strcmp(Line, "[Weather 0.3.x Update Data]"))
+ if ( !mir_strcmp(Line, "[Weather 0.3.x Update Data]"))
Data->InternalVer = 1;
- else if ( !strcmp(Line, "[Weather 0.3.x Update Data 1.1]"))
+ else if ( !mir_strcmp(Line, "[Weather 0.3.x Update Data 1.1]"))
Data->InternalVer = 2;
- else if ( !strcmp(Line, "[Weather 0.3.x Update Data 1.1a]"))
+ else if ( !mir_strcmp(Line, "[Weather 0.3.x Update Data 1.1a]"))
Data->InternalVer = 3;
- else if ( !strcmp(Line, "[Weather 0.3.x Update Data 1.2]"))
+ else if ( !mir_strcmp(Line, "[Weather 0.3.x Update Data 1.2]"))
Data->InternalVer = 4;
- else if ( !strcmp(Line, "[Weather 0.3.x Update Data 1.3]"))
+ else if ( !mir_strcmp(Line, "[Weather 0.3.x Update Data 1.3]"))
Data->InternalVer = 5;
- else if ( !strcmp(Line, "[Weather 0.3.x Update Data 1.4]"))
+ else if ( !mir_strcmp(Line, "[Weather 0.3.x Update Data 1.4]"))
Data->InternalVer = 6;
- else if ( !strcmp(Line, "[Weather 0.3.x Update Data 1.5]"))
+ else if ( !mir_strcmp(Line, "[Weather 0.3.x Update Data 1.5]"))
Data->InternalVer = 7;
else
{
diff --git a/plugins/WebView/src/webview_services.cpp b/plugins/WebView/src/webview_services.cpp index 998ec84c8b..2dae6b0c4e 100644 --- a/plugins/WebView/src/webview_services.cpp +++ b/plugins/WebView/src/webview_services.cpp @@ -37,15 +37,15 @@ int DBSettingChanged(WPARAM wParam, LPARAM lParam) return 0; DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *) lParam; - if (!strcmp(cws->szModule, "CList")) { + if (!mir_strcmp(cws->szModule, "CList")) { int invalidpresent = 0; char *szProto = GetContactProto(hContact); - if (szProto == NULL || strcmp(szProto, MODULENAME)) + if (szProto == NULL || mir_strcmp(szProto, MODULENAME)) return 0; // A contact is renamed - if (!strcmp(cws->szSetting, "MyHandle")) { + if (!mir_strcmp(cws->szSetting, "MyHandle")) { ptrT oldName( db_get_tsa(hContact, MODULENAME, PRESERVE_NAME_KEY)); if (oldName == NULL) return 0; diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp index 84519887e3..7ad4b7a7c8 100644 --- a/plugins/WhenWasIt/src/hooked_events.cpp +++ b/plugins/WhenWasIt/src/hooked_events.cpp @@ -59,7 +59,7 @@ static int OnContactSettingChanged(WPARAM hContact, LPARAM lParam) {
DBCONTACTWRITESETTING *dw = (DBCONTACTWRITESETTING *)lParam;
DBVARIANT dv = dw->value;
- if ((strcmp(dw->szModule, DUMMY_MODULE) == 0) && (strcmp(dw->szSetting, DUMMY_SETTING) == 0))
+ if ((mir_strcmp(dw->szModule, DUMMY_MODULE) == 0) && (mir_strcmp(dw->szSetting, DUMMY_SETTING) == 0))
RefreshContactListIcons(hContact);
return 0;
diff --git a/plugins/YAMN/src/account.cpp b/plugins/YAMN/src/account.cpp index 590c812355..db7ce8166b 100644 --- a/plugins/YAMN/src/account.cpp +++ b/plugins/YAMN/src/account.cpp @@ -1006,7 +1006,7 @@ INT_PTR FindAccountByNameSvc(WPARAM wParam, LPARAM lParam) DebugLog(SynchroFile,"FindAccountByName:AccountBrowserSO-read enter\n"); #endif for (Finder = Plugin->FirstAccount; Finder != NULL; Finder = Finder->Next) - if ((Finder->Name != NULL) && (0 == strcmp(SearchedAccount, Finder->Name))) + if ((Finder->Name != NULL) && (0 == mir_strcmp(SearchedAccount, Finder->Name))) break; #ifdef DEBUG_SYNCHRO DebugLog(SynchroFile,"FindAccountByName:AccountBrowserSO-read done\n"); diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp index e15d71731d..ece3465f5f 100644 --- a/plugins/YAMN/src/browser/mailbrowser.cpp +++ b/plugins/YAMN/src/browser/mailbrowser.cpp @@ -1214,7 +1214,7 @@ int CALLBACK ListViewCompareProc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSo str2 = Header2.From; else str2 = Header2.FromNick; - nResult = strcmp(str1, str2); + nResult = mir_strcmp(str1, str2); if (bFrom) nResult = -nResult; break; @@ -1227,7 +1227,7 @@ int CALLBACK ListViewCompareProc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSo str2 = " "; else str2 = Header2.Subject; - nResult = strcmp(str1, str2); + nResult = mir_strcmp(str1, str2); if (bSub) nResult = -nResult; break; @@ -1258,7 +1258,7 @@ int CALLBACK ListViewCompareProc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSo if (Header2.Subject == NULL) str2 = " "; else str2 = Header2.Subject; - nResult = strcmp(str1, str2); + nResult = mir_strcmp(str1, str2); break; } //MessageBox(NULL,str1,str2,0); @@ -1390,7 +1390,7 @@ INT_PTR CALLBACK DlgProcYAMNShowMessage(HWND hDlg, UINT msg, WPARAM wParam, LPAR Subj = new WCHAR[wcslen(str2) + 1]; wcscpy(Subj, str2); } - //if (!hasBody) if (!strcmp(Header->name,"Body")) hasBody = true; + //if (!hasBody) if (!mir_strcmp(Header->name,"Body")) hasBody = true; int count = 0; WCHAR **split = 0; int ofs = 0; while (str2[ofs]) { diff --git a/plugins/YAMN/src/mails/decode.cpp b/plugins/YAMN/src/mails/decode.cpp index f2a0837e7b..6ca2a0238b 100644 --- a/plugins/YAMN/src/mails/decode.cpp +++ b/plugins/YAMN/src/mails/decode.cpp @@ -229,7 +229,7 @@ int GetCharsetFromString(char *input,size_t size) for (int i=0;i<CPLENALL;i++) {
size_t len = mir_strlen(CodePageNamesAll[i].NameBase);
if (0==strncmp(pout,CodePageNamesAll[i].NameBase,len)) {
- if (0==strcmp(pout+len,CodePageNamesAll[i].NameSub)) {
+ if (0==mir_strcmp(pout+len,CodePageNamesAll[i].NameSub)) {
delete[] pout;
return CodePageNamesAll[i].CP;
}
diff --git a/plugins/YAMN/src/mails/mails.cpp b/plugins/YAMN/src/mails/mails.cpp index 53d7d54535..9114c061e1 100644 --- a/plugins/YAMN/src/mails/mails.cpp +++ b/plugins/YAMN/src/mails/mails.cpp @@ -252,7 +252,7 @@ void WINAPI SynchroMessagesFcn(HACCOUNT Account,HYAMNMAIL *OldQueue,HYAMNMAIL *R if (Parser->ID==NULL) //simply ignore the message, that has not filled its ID
continue;
- if (0==strcmp(Parser->ID,Finder->ID)) //search for equal message in new queue
+ if (0==mir_strcmp(Parser->ID,Finder->ID)) //search for equal message in new queue
break;
}
if (Parser != NULL) //found equal message in new queue
diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp index 4bebbbbd91..d67712eb0a 100644 --- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp @@ -286,7 +286,7 @@ int RegisterPOP3Plugin(WPARAM, LPARAM) Finder->hContact = NULL;
for (MCONTACT hContact = db_find_first(YAMN_DBMODULE); hContact; hContact = db_find_next(hContact, YAMN_DBMODULE)) {
if (!db_get_s(hContact, YAMN_DBMODULE, "Id", &dbv)) {
- if (strcmp(dbv.pszVal, Finder->Name) == 0) {
+ if (mir_strcmp(dbv.pszVal, Finder->Name) == 0) {
Finder->hContact = hContact;
db_set_w(Finder->hContact, YAMN_DBMODULE, "Status", ID_STATUS_ONLINE);
db_set_s(Finder->hContact, "CList", "StatusMsg", Translate("No new mail message"));
@@ -711,7 +711,7 @@ DWORD WINAPI SynchroPOP3(struct CheckParam * WhichTemp) if (MsgQueuePtr->Flags&YAMN_MSG_BODYREQUESTED) {
HYAMNMAIL NewMsgsPtr = NULL;
for (NewMsgsPtr = (HYAMNMAIL)NewMails; NewMsgsPtr != NULL; NewMsgsPtr = NewMsgsPtr->Next) {
- if (!strcmp(MsgQueuePtr->ID, NewMsgsPtr->ID)) {
+ if (!mir_strcmp(MsgQueuePtr->ID, NewMsgsPtr->ID)) {
TCHAR accstatus[512];
mir_sntprintf(accstatus, SIZEOF(accstatus), TranslateT("Reading body %s"), NewMsgsPtr->ID);
SetAccountStatus(ActualAccount, accstatus);
diff --git a/plugins/YAPP/src/services.cpp b/plugins/YAPP/src/services.cpp index fd9454bb82..7bda806525 100644 --- a/plugins/YAPP/src/services.cpp +++ b/plugins/YAPP/src/services.cpp @@ -383,7 +383,7 @@ static INT_PTR CreateClassPopup(WPARAM wParam, LPARAM lParam) pc = (POPUPCLASS *)wParam;
else {
for (int i = 0; i < arClasses.getCount(); i++) {
- if (strcmp(arClasses[i]->pszName, pdc->pszClassName) == 0) {
+ if (mir_strcmp(arClasses[i]->pszName, pdc->pszClassName) == 0) {
pc = arClasses[i];
break;
}
|