From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 29 Jul 2016 12:36:34 +0000
Subject: no more TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SplashScreen/src/bitmap_funcs.cpp |  2 +-
 plugins/SplashScreen/src/main.cpp         |  6 +++---
 plugins/SplashScreen/src/options.cpp      | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/SplashScreen/src')

diff --git a/plugins/SplashScreen/src/bitmap_funcs.cpp b/plugins/SplashScreen/src/bitmap_funcs.cpp
index c0d1531c17..0c45210801 100644
--- a/plugins/SplashScreen/src/bitmap_funcs.cpp
+++ b/plugins/SplashScreen/src/bitmap_funcs.cpp
@@ -131,7 +131,7 @@ bool MyBitmap::loadFromFile(wchar_t *fn)
 {
 	if (bits) free();
 
-	HBITMAP hBmpLoaded = (HBITMAP)CallService(MS_IMG_LOAD, (WPARAM)fn, IMGL_TCHAR);
+	HBITMAP hBmpLoaded = (HBITMAP)CallService(MS_IMG_LOAD, (WPARAM)fn, IMGL_WCHAR);
 	if (!hBmpLoaded) {
 		#ifdef _DEBUG
 		logMessage(L"MyBitmap::loadFromFile", L"Bitmap load failed");
diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp
index 9fa6d0263d..c5eb3608f9 100644
--- a/plugins/SplashScreen/src/main.cpp
+++ b/plugins/SplashScreen/src/main.cpp
@@ -83,14 +83,14 @@ void SplashMain()
 
 	if (bstartup & (options.active == 1)) {
 		DBVARIANT dbv = { 0 };
-		if (!db_get_ts(NULL, MODNAME, "VersionPrefix", &dbv)) {
+		if (!db_get_ws(NULL, MODNAME, "VersionPrefix", &dbv)) {
 			mir_wstrcpy(szPrefix, dbv.ptszVal);
 			db_free(&dbv);
 		}
 		else
 			mir_wstrcpy(szPrefix, L"");
 
-		if (!db_get_ts(NULL, MODNAME, "Path", &dbv)) {
+		if (!db_get_ws(NULL, MODNAME, "Path", &dbv)) {
 			mir_wstrcpy(inBuf, dbv.ptszVal);
 			db_free(&dbv);
 		}
@@ -107,7 +107,7 @@ void SplashMain()
 		else
 			mir_wstrcpy(szSplashFile, inBuf);
 
-		if (!db_get_ts(NULL, MODNAME, "Sound", &dbv)) {
+		if (!db_get_ws(NULL, MODNAME, "Sound", &dbv)) {
 			mir_wstrcpy(inBuf, dbv.ptszVal);
 			db_free(&dbv);
 		}
diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp
index dce6380576..49aed98c8e 100644
--- a/plugins/SplashScreen/src/options.cpp
+++ b/plugins/SplashScreen/src/options.cpp
@@ -68,7 +68,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				ReadDbConfig();
 				wchar_t inBuf[80];
 				DBVARIANT dbv = { 0 };
-				if (!db_get_ts(NULL, MODNAME, "Path", &dbv)) {
+				if (!db_get_ws(NULL, MODNAME, "Path", &dbv)) {
 					mir_wstrcpy(inBuf, dbv.ptszVal);
 					db_free(&dbv);
 				}
@@ -76,7 +76,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					mir_wstrcpy(inBuf, L"splash\\splash.png");
 				SetDlgItemText(hwndDlg, IDC_SPLASHPATH, inBuf);
 
-				if (!db_get_ts(NULL, MODNAME, "Sound", &dbv)) {
+				if (!db_get_ws(NULL, MODNAME, "Sound", &dbv)) {
 					mir_wstrcpy(inBuf, dbv.ptszVal);
 					db_free(&dbv);
 				}
@@ -84,7 +84,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					mir_wstrcpy(inBuf, L"sounds\\startup.wav");
 				SetDlgItemText(hwndDlg, IDC_SNDPATH, inBuf);
 
-				if (!db_get_ts(NULL, MODNAME, "VersionPrefix", &dbv)) {
+				if (!db_get_ws(NULL, MODNAME, "VersionPrefix", &dbv)) {
 					mir_wstrcpy(inBuf, dbv.ptszVal);
 					db_free(&dbv);
 				}
@@ -288,13 +288,13 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 						wchar_t tmp[MAX_PATH];
 
 						GetDlgItemText(hwndDlg, IDC_SPLASHPATH, tmp, _countof(tmp));
-						db_set_ts(NULL, MODNAME, "Path", tmp);
+						db_set_ws(NULL, MODNAME, "Path", tmp);
 
 						GetDlgItemText(hwndDlg, IDC_SNDPATH, tmp, _countof(tmp));
-						db_set_ts(NULL, MODNAME, "Sound", tmp);
+						db_set_ws(NULL, MODNAME, "Sound", tmp);
 
 						GetDlgItemText(hwndDlg, IDC_VERSIONPREFIX, tmp, _countof(tmp));
-						db_set_ts(NULL, MODNAME, "VersionPrefix", tmp);
+						db_set_ws(NULL, MODNAME, "VersionPrefix", tmp);
 						mir_wstrcpy(szPrefix, tmp);
 
 						GetDlgItemText(hwndDlg, IDC_SHOWTIME, tmp, _countof(tmp));
-- 
cgit v1.2.3