diff options
Diffstat (limited to 'src/mir_core')
| -rw-r--r-- | src/mir_core/src/db.cpp | 12 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core.def | 4 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core64.def | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp index 6a0f771945..9395366c29 100644 --- a/src/mir_core/src/db.cpp +++ b/src/mir_core/src/db.cpp @@ -196,26 +196,26 @@ MIR_CORE_DLL(wchar_t*) db_get_wsa(MCONTACT hContact, const char *szModule, const return (szValue == nullptr) ? nullptr : mir_wstrdup(szValue);
}
-MIR_CORE_DLL(CMStringA) db_get_sm(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting)
+MIR_CORE_DLL(CMStringA) db_get_sm(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting, const char *szValue)
{
if (currDb == nullptr)
- return CMStringA();
+ return (szValue == nullptr) ? CMStringA() : CMStringA(szValue);
DBVARIANT dbv = { DBVT_ASCIIZ };
if (currDb->GetContactSettingStr(hContact, szModule, szSetting, &dbv))
- return CMStringA();
+ return (szValue == nullptr) ? CMStringA() : CMStringA(szValue);
return CMStringA(ptrA(dbv.pszVal));
}
-MIR_CORE_DLL(CMStringW) db_get_wsm(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting)
+MIR_CORE_DLL(CMStringW) db_get_wsm(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting, const wchar_t *szValue)
{
if (currDb == nullptr)
- return CMStringW();
+ return (szValue == nullptr) ? CMStringW() : CMStringW(szValue);
DBVARIANT dbv = { DBVT_WCHAR };
if (currDb->GetContactSettingStr(hContact, szModule, szSetting, &dbv))
- return CMStringW();
+ return (szValue == nullptr) ? CMStringW() : CMStringW(szValue);
return CMStringW(ptrW(dbv.pwszVal));
}
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 50e1c5a66d..735cffd6f6 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -1042,8 +1042,8 @@ IsTerminalDisconnected @1245 ??1CCtrlLabel@@UAE@XZ @1257 NONAME
??_7CCtrlLabel@@6B@ @1258 NONAME
CallObjectEventHook @1259
-?db_get_sm@@YG?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@IPBD0@Z @1260 NONAME
-?db_get_wsm@@YG?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@IPBD0@Z @1261 NONAME
+?db_get_sm@@YG?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@IPBD00@Z @1682 NONAME
+?db_get_wsm@@YG?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@IPBD0PB_W@Z @1683 NONAME
?CreateLink@CDlgBase@@IAEXAAVCCtrlData@@PBDEK@Z @1262 NONAME
?CreateLink@CDlgBase@@IAEXAAVCCtrlData@@PBDPA_W@Z @1263 NONAME
?CheckRowCount@CCtrlPages@@AAEXXZ @1264 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 298ed29c9c..9f5bddc8bb 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -1042,8 +1042,8 @@ IsTerminalDisconnected @1245 ??1CCtrlLabel@@UEAA@XZ @1257 NONAME
??_7CCtrlLabel@@6B@ @1258 NONAME
CallObjectEventHook @1259
-?db_get_sm@@YA?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@IPEBD0@Z @1260 NONAME
-?db_get_wsm@@YA?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@IPEBD0@Z @1261 NONAME
+?db_get_sm@@YA?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@IPEBD00@Z @1682 NONAME
+?db_get_wsm@@YA?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@IPEBD0PEB_W@Z @1683 NONAME
?CreateLink@CDlgBase@@IEAAXAEAVCCtrlData@@PEBDEK@Z @1262 NONAME
?CreateLink@CDlgBase@@IEAAXAEAVCCtrlData@@PEBDPEA_W@Z @1263 NONAME
?CheckRowCount@CCtrlPages@@AEAAXXZ @1264 NONAME
|