From d296f9f99daf102b9af5d56690e2bd00d61c1267 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
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/SplashScreen/src/main.cpp    | 6 +++---
 plugins/SplashScreen/src/options.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/SplashScreen')

diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp
index 47f949afc2..89c9c2ec2d 100644
--- a/plugins/SplashScreen/src/main.cpp
+++ b/plugins/SplashScreen/src/main.cpp
@@ -78,14 +78,14 @@ void SplashMain()
 	if (bstartup & (options.active == 1)) {
 		DBVARIANT dbv = { 0 };
 		if (!db_get_ws(NULL, MODULENAME, "VersionPrefix", &dbv)) {
-			mir_wstrcpy(szPrefix, dbv.ptszVal);
+			mir_wstrcpy(szPrefix, dbv.pwszVal);
 			db_free(&dbv);
 		}
 		else
 			mir_wstrcpy(szPrefix, L"");
 
 		if (!db_get_ws(NULL, MODULENAME, "Path", &dbv)) {
-			mir_wstrcpy(inBuf, dbv.ptszVal);
+			mir_wstrcpy(inBuf, dbv.pwszVal);
 			db_free(&dbv);
 		}
 		else mir_wstrcpy(inBuf, L"splash\\splash.png");
@@ -102,7 +102,7 @@ void SplashMain()
 			mir_wstrcpy(szSplashFile, inBuf);
 
 		if (!db_get_ws(NULL, MODULENAME, "Sound", &dbv)) {
-			mir_wstrcpy(inBuf, dbv.ptszVal);
+			mir_wstrcpy(inBuf, dbv.pwszVal);
 			db_free(&dbv);
 		}
 		else mir_wstrcpy(inBuf, L"sounds\\startup.wav");
diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp
index ae68e43f83..37758b59e5 100644
--- a/plugins/SplashScreen/src/options.cpp
+++ b/plugins/SplashScreen/src/options.cpp
@@ -54,21 +54,21 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		{
 			DBVARIANT dbv = { 0 };
 			if (!db_get_ws(NULL, MODULENAME, "Path", &dbv)) {
-				mir_wstrcpy(inBuf, dbv.ptszVal);
+				mir_wstrcpy(inBuf, dbv.pwszVal);
 				db_free(&dbv);
 			}
 			else mir_wstrcpy(inBuf, L"splash\\splash.png");
 			SetDlgItemText(hwndDlg, IDC_SPLASHPATH, inBuf);
 
 			if (!db_get_ws(NULL, MODULENAME, "Sound", &dbv)) {
-				mir_wstrcpy(inBuf, dbv.ptszVal);
+				mir_wstrcpy(inBuf, dbv.pwszVal);
 				db_free(&dbv);
 			}
 			else mir_wstrcpy(inBuf, L"sounds\\startup.wav");
 			SetDlgItemText(hwndDlg, IDC_SNDPATH, inBuf);
 
 			if (!db_get_ws(NULL, MODULENAME, "VersionPrefix", &dbv)) {
-				mir_wstrcpy(inBuf, dbv.ptszVal);
+				mir_wstrcpy(inBuf, dbv.pwszVal);
 				db_free(&dbv);
 			}
 			else mir_wstrcpy(inBuf, L"");
-- 
cgit v1.2.3