diff options
Diffstat (limited to 'plugins/DbEditorPP')
| -rw-r--r-- | plugins/DbEditorPP/src/findwindow.cpp | 6 | ||||
| -rw-r--r-- | plugins/DbEditorPP/src/headers.h | 2 |
2 files changed, 4 insertions, 4 deletions
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;\
|