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.

3 files changed, 14 insertions, 14 deletions

diff --git a/src/core/stduserinfo/src/contactinfo.cpp b/src/core/stduserinfo/src/contactinfo.cpp
index bd99b262d7..d6373e2fba 100644
--- a/src/core/stduserinfo/src/contactinfo.cpp
+++ b/src/core/stduserinfo/src/contactinfo.cpp
@@ -293,7 +293,7 @@ INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 						mir_snwprintf(idstr2, L"%d", i + 2);

 					}

 					ListView_InsertItem(GetDlgItem(hwndDlg, IDC_EMAILS), &lvi);

-					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_EMAILS), lvi.iItem, 1, dbv.ptszVal);

+					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_EMAILS), lvi.iItem, 1, dbv.pwszVal);

 					db_free(&dbv);

 					lvi.iItem++;

 				}

@@ -306,7 +306,7 @@ INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					lvi.pszText = idstr2;

 					mir_snwprintf(idstr2, TranslateT("Custom %d"), i + 1);

 					ListView_InsertItem(GetDlgItem(hwndDlg, IDC_EMAILS), &lvi);

-					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_EMAILS), lvi.iItem, 1, dbv.ptszVal);

+					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_EMAILS), lvi.iItem, 1, dbv.pwszVal);

 					db_free(&dbv);

 					lvi.iItem++;

 				}

@@ -322,14 +322,14 @@ INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				if (!db_get_ws(hContact, szProto, "Phone", &dbv)) {

 					lvi.pszText = TranslateT("Primary");

 					ListView_InsertItem(GetDlgItem(hwndDlg, IDC_PHONES), &lvi);

-					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.ptszVal);

+					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.pwszVal);

 					db_free(&dbv);

 					lvi.iItem++;

 				}

 				if (!db_get_ws(hContact, szProto, "Fax", &dbv)) {

 					lvi.pszText = TranslateT("Fax");

 					ListView_InsertItem(GetDlgItem(hwndDlg, IDC_PHONES), &lvi);

-					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.ptszVal);

+					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.pwszVal);

 					db_free(&dbv);

 					lvi.iItem++;

 				}

@@ -338,23 +338,23 @@ INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					ListView_InsertItem(GetDlgItem(hwndDlg, IDC_PHONES), &lvi);

 					if (mir_strlen(dbv.pszVal) > 4 && !mir_strcmp(dbv.pszVal + mir_strlen(dbv.pszVal) - 4, " SMS")) {

 						ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 2, L"y");

-						dbv.ptszVal[mir_wstrlen(dbv.ptszVal) - 4] = '\0';

+						dbv.pwszVal[mir_wstrlen(dbv.pwszVal) - 4] = '\0';

 					}

-					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.ptszVal);

+					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.pwszVal);

 					db_free(&dbv);

 					lvi.iItem++;

 				}

 				if (!db_get_ws(hContact, szProto, "CompanyPhone", &dbv)) {

 					lvi.pszText = TranslateT("Work phone");

 					ListView_InsertItem(GetDlgItem(hwndDlg, IDC_PHONES), &lvi);

-					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.ptszVal);

+					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.pwszVal);

 					db_free(&dbv);

 					lvi.iItem++;

 				}

 				if (!db_get_ws(hContact, szProto, "CompanyFax", &dbv)) {

 					lvi.pszText = TranslateT("Work fax");

 					ListView_InsertItem(GetDlgItem(hwndDlg, IDC_PHONES), &lvi);

-					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.ptszVal);

+					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.pwszVal);

 					db_free(&dbv);

 					lvi.iItem++;

 				}

@@ -367,11 +367,11 @@ INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					lvi.pszText = idstr2;

 					mir_snwprintf(idstr2, TranslateT("Custom %d"), i + 1);

 					ListView_InsertItem(GetDlgItem(hwndDlg, IDC_PHONES), &lvi);

-					if (mir_wstrlen(dbv.ptszVal) > 4 && !mir_wstrcmp(dbv.ptszVal + mir_wstrlen(dbv.ptszVal) - 4, L" SMS")) {

+					if (mir_wstrlen(dbv.pwszVal) > 4 && !mir_wstrcmp(dbv.pwszVal + mir_wstrlen(dbv.pwszVal) - 4, L" SMS")) {

 						ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 2, L"y");

-						dbv.ptszVal[mir_wstrlen(dbv.ptszVal) - 4] = '\0';

+						dbv.pwszVal[mir_wstrlen(dbv.pwszVal) - 4] = '\0';

 					}

-					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.ptszVal);

+					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 1, dbv.pwszVal);

 					db_free(&dbv);

 					lvi.iItem++;

 				}

diff --git a/src/core/stduserinfo/src/stdinfo.cpp b/src/core/stduserinfo/src/stdinfo.cpp
index 338007fb4f..7983a0f6ff 100644
--- a/src/core/stduserinfo/src/stdinfo.cpp
+++ b/src/core/stduserinfo/src/stdinfo.cpp
@@ -55,7 +55,7 @@ static wchar_t* Proto_GetContactInfoSettingStr(bool proto_service, MCONTACT hCon
 	if (CallProtoService(szModule, PS_GETINFOSETTING, hContact, (LPARAM)&cgs))

 		return nullptr;

 

-	return dbv.ptszVal;

+	return dbv.pwszVal;

 }

 

 static void SetValue(HWND hwndDlg, int idCtrl, MCONTACT hContact, char *szModule, char *szSetting, int special)

@@ -152,7 +152,7 @@ static void SetValue(HWND hwndDlg, int idCtrl, MCONTACT hContact, char *szModule
 					char szSettingName[100];

 					mir_snprintf(szSettingName, "%sName", szSetting);

 					if (!db_get_ws(hContact, szModule, szSettingName, &dbv)) {

-						ptstr = dbv.ptszVal;

+						ptstr = dbv.pwszVal;

 						unspecified = false;

 						break;

 					}

diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp
index 5f43ae35a7..4a1385545b 100644
--- a/src/core/stduserinfo/src/userinfo.cpp
+++ b/src/core/stduserinfo/src/userinfo.cpp
@@ -266,7 +266,7 @@ static INT_PTR CALLBACK DlgProcDetails(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			LPTSTR ptszLastTab;

 			DBVARIANT dbv;

 			if (!db_get_ws(NULL, MODULENAME, "LastTab", &dbv)) {

-				ptszLastTab = NEWWSTR_ALLOCA(dbv.ptszVal);

+				ptszLastTab = NEWWSTR_ALLOCA(dbv.pwszVal);

 				db_free(&dbv);

 			}

 			else ptszLastTab = nullptr;