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, 13 insertions, 13 deletions

diff --git a/plugins/SeenPlugin/src/history.cpp b/plugins/SeenPlugin/src/history.cpp
index 75b5002c6d..750f8ee3a8 100644
--- a/plugins/SeenPlugin/src/history.cpp
+++ b/plugins/SeenPlugin/src/history.cpp
@@ -53,7 +53,7 @@ void HistoryWrite(MCONTACT hContact)
 	wchar_t *ptszString;

 	DBVARIANT dbv;

 	if (!db_get_ws(NULL, S_MOD, "HistoryStamp", &dbv)) {

-		ptszString = ParseString(dbv.ptszVal, hContact);

+		ptszString = ParseString(dbv.pwszVal, hContact);

 		db_free(&dbv);

 	}

 	else ptszString = ParseString(DEFAULT_HISTORYSTAMP, hContact);

@@ -89,7 +89,7 @@ void LoadHistoryList(MCONTACT hContact, HWND hwnd, int nList)
 

 		DBVARIANT dbv;

 		if (!db_get_ws(hContact, S_MOD, BuildSetting(i), &dbv)) {

-			SendDlgItemMessage(hwnd, nList, LB_ADDSTRING, 0, (LPARAM)dbv.ptszVal);

+			SendDlgItemMessage(hwnd, nList, LB_ADDSTRING, 0, (LPARAM)dbv.pwszVal);

 			db_free(&dbv);

 		}

 		else SendDlgItemMessage(hwnd, nList, LB_ADDSTRING, 0, (LPARAM)L"");

diff --git a/plugins/SeenPlugin/src/options.cpp b/plugins/SeenPlugin/src/options.cpp
index 8c9d456781..4dc20f51ec 100644
--- a/plugins/SeenPlugin/src/options.cpp
+++ b/plugins/SeenPlugin/src/options.cpp
@@ -116,13 +116,13 @@ INT_PTR CALLBACK OptsPopupsDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp
 		}

 

 		if (!db_get_ws(NULL, S_MOD, "PopupStamp", &dbv)) {

-			SetDlgItemText(hdlg, IDC_POPUPSTAMP, dbv.ptszVal);

+			SetDlgItemText(hdlg, IDC_POPUPSTAMP, dbv.pwszVal);

 			db_free(&dbv);

 		}

 		else SetDlgItemText(hdlg, IDC_POPUPSTAMP, DEFAULT_POPUPSTAMP);

 

 		if (!db_get_ws(NULL, S_MOD, "PopupStampText", &dbv)) {

-			SetDlgItemText(hdlg, IDC_POPUPSTAMPTEXT, dbv.ptszVal);

+			SetDlgItemText(hdlg, IDC_POPUPSTAMPTEXT, dbv.pwszVal);

 			db_free(&dbv);

 		}

 		else SetDlgItemText(hdlg, IDC_POPUPSTAMPTEXT, DEFAULT_POPUPSTAMPTEXT);

@@ -247,31 +247,31 @@ INT_PTR CALLBACK OptsSettingsDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM
 		EnableWindow(GetDlgItem(hdlg, IDC_COUNT), IsDlgButtonChecked(hdlg, IDC_MISSEDONES));

 

 		if (!db_get_ws(NULL, S_MOD, "MenuStamp", &dbv)) {

-			SetDlgItemText(hdlg, IDC_MENUSTAMP, dbv.ptszVal);

+			SetDlgItemText(hdlg, IDC_MENUSTAMP, dbv.pwszVal);

 			db_free(&dbv);

 		}

 		else SetDlgItemText(hdlg, IDC_MENUSTAMP, DEFAULT_MENUSTAMP);

 

 		if (!db_get_ws(NULL, S_MOD, "UserStamp", &dbv)) {

-			SetDlgItemText(hdlg, IDC_USERSTAMP, dbv.ptszVal);

+			SetDlgItemText(hdlg, IDC_USERSTAMP, dbv.pwszVal);

 			db_free(&dbv);

 		}

 		else SetDlgItemText(hdlg, IDC_USERSTAMP, DEFAULT_USERSTAMP);

 

 		if (!db_get_ws(NULL, S_MOD, "FileStamp", &dbv)) {

-			SetDlgItemText(hdlg, IDC_FILESTAMP, dbv.ptszVal);

+			SetDlgItemText(hdlg, IDC_FILESTAMP, dbv.pwszVal);

 			db_free(&dbv);

 		}

 		else SetDlgItemText(hdlg, IDC_FILESTAMP, DEFAULT_FILESTAMP);

 

 		if (!db_get_ws(NULL, S_MOD, "FileName", &dbv)) {

-			SetDlgItemText(hdlg, IDC_FILENAME, dbv.ptszVal);

+			SetDlgItemText(hdlg, IDC_FILENAME, dbv.pwszVal);

 			db_free(&dbv);

 		}

 		else SetDlgItemText(hdlg, IDC_FILENAME, DEFAULT_FILENAME);

 

 		if (!db_get_ws(NULL, S_MOD, "HistoryStamp", &dbv)) {

-			SetDlgItemText(hdlg, IDC_HISTORYSTAMP, dbv.ptszVal);

+			SetDlgItemText(hdlg, IDC_HISTORYSTAMP, dbv.pwszVal);

 			db_free(&dbv);

 		}

 		else SetDlgItemText(hdlg, IDC_HISTORYSTAMP, DEFAULT_HISTORYSTAMP);

diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp
index efce4f5e25..4a74383b56 100644
--- a/plugins/SeenPlugin/src/utils.cpp
+++ b/plugins/SeenPlugin/src/utils.cpp
@@ -273,7 +273,7 @@ wchar_t* ParseString(wchar_t *szstring, MCONTACT hcontact)
 

 		case 'G':

 			if (!db_get_ws(hcontact, "CList", "Group", &dbv)) {

-				wcsncpy(szdbsetting, dbv.ptszVal, _countof(szdbsetting));

+				wcsncpy(szdbsetting, dbv.pwszVal, _countof(szdbsetting));

 				db_free(&dbv);

 				charPtr = szdbsetting;

 				goto LBL_charPtr;

@@ -303,7 +303,7 @@ wchar_t* ParseString(wchar_t *szstring, MCONTACT hcontact)
 			if (db_get_ws(hcontact, "CList", "StatusMsg", &dbv))

 				goto LBL_noData;

 

-			d += mir_snwprintf(d, MAXSIZE - (d - sztemp), L"%s", dbv.ptszVal);

+			d += mir_snwprintf(d, MAXSIZE - (d - sztemp), L"%s", dbv.pwszVal);

 			db_free(&dbv);

 			break;

 

@@ -486,13 +486,13 @@ void ShowPopup(MCONTACT hcontact, const char * lpzProto, int newStatus)
 	ppd.lchIcon = Skin_LoadProtoIcon(lpzProto, newStatus);

 

 	if (!db_get_ws(NULL, S_MOD, "PopupStamp", &dbv)) {

-		wcsncpy(ppd.lptzContactName, ParseString(dbv.ptszVal, hcontact), MAX_CONTACTNAME);

+		wcsncpy(ppd.lptzContactName, ParseString(dbv.pwszVal, hcontact), MAX_CONTACTNAME);

 		db_free(&dbv);

 	}

 	else wcsncpy(ppd.lptzContactName, ParseString(DEFAULT_POPUPSTAMP, hcontact), MAX_CONTACTNAME);

 

 	if (!db_get_ws(NULL, S_MOD, "PopupStampText", &dbv)) {

-		wcsncpy(ppd.lptzText, ParseString(dbv.ptszVal, hcontact), MAX_SECONDLINE);

+		wcsncpy(ppd.lptzText, ParseString(dbv.pwszVal, hcontact), MAX_SECONDLINE);

 		db_free(&dbv);

 	}

 	else wcsncpy(ppd.lptzText, ParseString(DEFAULT_POPUPSTAMPTEXT, hcontact), MAX_SECONDLINE);