diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-24 11:11:26 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-24 11:11:26 +0300 |
| commit | d296f9f99daf102b9af5d56690e2bd00d61c1267 (patch) | |
| tree | 39311caaf80abf0b47ecb78cf94dc8157b193575 /plugins/SMS | |
| parent | ffc521e5d5e9bd66feb65afe0046b3fc7e073356 (diff) | |
database:
- senseless fiels ptszVal removed from DBVARIANT, pwszVal is used instead;
- if you want db_get to return a string, you need to use db_get_s.
Diffstat (limited to 'plugins/SMS')
| -rw-r--r-- | plugins/SMS/src/functions.cpp | 4 | ||||
| -rw-r--r-- | plugins/SMS/src/senddlg.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/SMS/src/functions.cpp b/plugins/SMS/src/functions.cpp index 1b26639ae9..ef904f371d 100644 --- a/plugins/SMS/src/functions.cpp +++ b/plugins/SMS/src/functions.cpp @@ -444,11 +444,11 @@ void LoadMsgDlgFont(int i, LOGFONT *lf, COLORREF *colour) }
if (lf) {
- if (db_get(NULL, SRMMMOD, str, &dbv)) {
+ if (db_get_ws(NULL, SRMMMOD, str, &dbv)) {
mir_wstrncpy(lf->lfFaceName, fontOptionsList[0].szDefFace, _countof(lf->lfFaceName));
}
else {
- mir_wstrncpy(lf->lfFaceName, dbv.ptszVal, _countof(lf->lfFaceName));
+ mir_wstrncpy(lf->lfFaceName, dbv.pwszVal, _countof(lf->lfFaceName));
db_free(&dbv);
}
diff --git a/plugins/SMS/src/senddlg.cpp b/plugins/SMS/src/senddlg.cpp index 4b5dbe0cb7..8ce68079e1 100644 --- a/plugins/SMS/src/senddlg.cpp +++ b/plugins/SMS/src/senddlg.cpp @@ -403,7 +403,8 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARA mir_wstrcat(tszPhone, L" SMS");
for (DWORD i = 0; bCont; i++) {
mir_snprintf(szBuff, "MyPhone%d", i);
- if (db_get(psswdWindowData->hMyContact, "UserInfo", szBuff, &dbv)) bCont = FALSE;
+ if (db_get(psswdWindowData->hMyContact, "UserInfo", szBuff, &dbv))
+ bCont = FALSE;
db_free(&dbv);
}
DB_SetStringW(psswdWindowData->hMyContact, "UserInfo", szBuff, tszPhone);
|