From d296f9f99daf102b9af5d56690e2bd00d61c1267 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 24 Jul 2018 11:11:26 +0300 Subject: 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. --- plugins/SMS/src/functions.cpp | 4 ++-- plugins/SMS/src/senddlg.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/SMS/src') 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); -- cgit v1.2.3