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.

4 files changed, 4 insertions, 4 deletions

diff --git a/plugins/StatusManager/src/aaa_options.cpp b/plugins/StatusManager/src/aaa_options.cpp
index 934e550227..612722770d 100644
--- a/plugins/StatusManager/src/aaa_options.cpp
+++ b/plugins/StatusManager/src/aaa_options.cpp
@@ -83,7 +83,7 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				settings[count]->status = it.iStatus;
 
 				DBVARIANT dbv;
-				if (!db_get(0, AAAMODULENAME, StatusModeToDbSetting(it.iStatus, SETTING_STATUSMSG), &dbv)) {
+				if (!db_get_s(0, AAAMODULENAME, StatusModeToDbSetting(it.iStatus, SETTING_STATUSMSG), &dbv)) {
 					settings[count]->msg = (char*)mir_alloc(mir_strlen(dbv.pszVal) + 1);
 					mir_strcpy(settings[count]->msg, dbv.pszVal);
 					db_free(&dbv);
diff --git a/plugins/StatusManager/src/keepstatus.cpp b/plugins/StatusManager/src/keepstatus.cpp
index 2fd5caf039..fde639d7e2 100644
--- a/plugins/StatusManager/src/keepstatus.cpp
+++ b/plugins/StatusManager/src/keepstatus.cpp
@@ -673,7 +673,7 @@ static void CheckContinuouslyFunction(void *)
 	BOOL ping = KSPlugin.getByte(SETTING_BYPING, FALSE);
 	if (ping) {
 		DBVARIANT dbv;
-		if (db_get(0, KSMODULENAME, SETTING_PINGHOST, &dbv))
+		if (db_get_s(0, KSMODULENAME, SETTING_PINGHOST, &dbv))
 			ping = FALSE;
 		else {
 			char *start, *end;
diff --git a/plugins/StatusManager/src/ss_profiles.cpp b/plugins/StatusManager/src/ss_profiles.cpp
index c6082e3479..74726c1df2 100644
--- a/plugins/StatusManager/src/ss_profiles.cpp
+++ b/plugins/StatusManager/src/ss_profiles.cpp
@@ -110,7 +110,7 @@ INT_PTR GetProfileName(WPARAM wParam, LPARAM lParam)
 	if (db_get_ws(0, SSMODULENAME, setting, &dbv))
 		return -1;
 
-	wcsncpy(buf, dbv.ptszVal, 128 - 1); buf[127] = 0;
+	wcsncpy(buf, dbv.pwszVal, 128 - 1); buf[127] = 0;
 	db_free(&dbv);
 	return 0;
 }
diff --git a/plugins/StatusManager/src/ss_toolbars.cpp b/plugins/StatusManager/src/ss_toolbars.cpp
index 9e4bce767d..8e0ed7e6cc 100644
--- a/plugins/StatusManager/src/ss_toolbars.cpp
+++ b/plugins/StatusManager/src/ss_toolbars.cpp
@@ -56,7 +56,7 @@ int CreateTopToolbarButtons(WPARAM, LPARAM)
 
 		DBVARIANT dbv;
 		mir_snprintf(setting, "%d_%s", i, SETTING_PROFILENAME);
-		if (db_get(0, SSMODULENAME, setting, &dbv))
+		if (db_get_s(0, SSMODULENAME, setting, &dbv))
 			continue;
 
 		ttb.hIconHandleDn = iconList[0].hIcolib;