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/SmileyAdd/src/options.cpp  |  2 +-
 plugins/SmileyAdd/src/services.cpp |  4 ++--
 plugins/SmileyAdd/src/smileys.cpp  | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/SmileyAdd/src')

diff --git a/plugins/SmileyAdd/src/options.cpp b/plugins/SmileyAdd/src/options.cpp
index e2c18a576f..8933288e97 100644
--- a/plugins/SmileyAdd/src/options.cpp
+++ b/plugins/SmileyAdd/src/options.cpp
@@ -278,7 +278,7 @@ void OptionsDialogType::UpdateVisibleSmPackList(void)
 			CMStringW ProtoName = it->GetName();
 			DBVARIANT dbv;
 			if (db_get_ws(NULL, _T2A(ProtoName.GetBuffer()), "AM_BaseProto", &dbv) == 0) {
-				ProtoName = dbv.ptszVal;
+				ProtoName = dbv.pwszVal;
 				db_free(&dbv);
 			}
 			else
diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp
index 21ca56813b..441b491af7 100644
--- a/plugins/SmileyAdd/src/services.cpp
+++ b/plugins/SmileyAdd/src/services.cpp
@@ -47,12 +47,12 @@ SmileyPackType* GetSmileyPack(const char *proto, MCONTACT hContact, SmileyPackCT
 			if (protonam != nullptr) {
 				DBVARIANT dbv;
 				if (db_get_ws(hContact, protonam, "Transport", &dbv) == 0) {
-					categoryName = dbv.ptszVal;
+					categoryName = dbv.pwszVal;
 					db_free(&dbv);
 				}
 				else if (opt.UsePhysProto && db_get_ws(NULL, protonam, "AM_BaseProto", &dbv) == 0) {
 					categoryName = L"AllProto";
-					categoryName += dbv.ptszVal;
+					categoryName += dbv.pwszVal;
 					db_free(&dbv);
 					CMStringW categoryFileName = g_SmileyCategories.GetSmileyCategory(categoryName) ? g_SmileyCategories.GetSmileyCategory(categoryName)->GetFilename() : L"";
 					if (categoryFileName.IsEmpty())
diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp
index 8cb83f881d..1034a37b51 100644
--- a/plugins/SmileyAdd/src/smileys.cpp
+++ b/plugins/SmileyAdd/src/smileys.cpp
@@ -794,7 +794,7 @@ void SmileyCategoryListType::AddAccountAsCategory(PROTOACCOUNT *acc, const CMStr
 
 		if (db_get_ws(NULL, acc->szModuleName, "AM_BaseProto", &dbv) == 0) {
 			PhysProtoName = L"AllProto";
-			PhysProtoName += dbv.ptszVal;
+			PhysProtoName += dbv.pwszVal;
 			db_free(&dbv);
 		}
 
@@ -861,7 +861,7 @@ void SmileyCategoryListType::DeleteAccountAsCategory(PROTOACCOUNT *acc)
 
 		DBVARIANT dbv;
 		if (!db_get_ws(hContact, proto, "Transport", &dbv)) {
-			bool found = (tname.CompareNoCase(dbv.ptszVal) == 0);
+			bool found = (tname.CompareNoCase(dbv.pwszVal) == 0);
 			db_free(&dbv);
 			if (found)
 				return;
@@ -884,11 +884,11 @@ void SmileyCategoryListType::AddContactTransportAsCategory(MCONTACT hContact, co
 
 	DBVARIANT dbv;
 	if (!db_get_ws(hContact, proto, "Transport", &dbv)) {
-		if (dbv.ptszVal[0] == '\0') {
+		if (dbv.pwszVal[0] == '\0') {
 			db_free(&dbv);
 			return;
 		}
-		char *trsp = mir_strdup(_T2A(dbv.ptszVal));
+		char *trsp = mir_strdup(_T2A(dbv.pwszVal));
 		_strlwr(trsp);
 
 		const char *packname = nullptr;
@@ -905,7 +905,7 @@ void SmileyCategoryListType::AddContactTransportAsCategory(MCONTACT hContact, co
 
 		mir_free(trsp);
 
-		CMStringW displayName = dbv.ptszVal;
+		CMStringW displayName = dbv.pwszVal;
 		if (packname != nullptr) {
 			char path[MAX_PATH];
 			mir_snprintf(path, "Smileys\\nova\\%s.msl", packname);
-- 
cgit v1.2.3