less TCHARs:

- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 72 insertions, 74 deletions

diff --git a/plugins/SplashScreen/src/bitmap_funcs.cpp b/plugins/SplashScreen/src/bitmap_funcs.cpp
index 33ef919c64..9c89965cbe 100644
--- a/plugins/SplashScreen/src/bitmap_funcs.cpp
+++ b/plugins/SplashScreen/src/bitmap_funcs.cpp
@@ -38,7 +38,7 @@ MyBitmap::MyBitmap(int w, int h)
 	allocate(w, h);

 }

 

-MyBitmap::MyBitmap(TCHAR *fn)

+MyBitmap::MyBitmap(wchar_t *fn)

 {

 	dcBmp = 0;

 	hBmp = 0;

@@ -118,7 +118,7 @@ void MyBitmap::restoreAlpha(int x, int y, int w, int h)
 	bitsSave = 0;

 }

 

-void MyBitmap::DrawText(TCHAR *str, int x, int y)

+void MyBitmap::DrawText(wchar_t *str, int x, int y)

 {

 	SIZE sz; GetTextExtentPoint32(this->getDC(), str, (int)mir_tstrlen(str), &sz);

 	RECT rc; SetRect(&rc, x, y, x + 10000, y + 10000);

@@ -127,7 +127,7 @@ void MyBitmap::DrawText(TCHAR *str, int x, int y)
 	this->restoreAlpha(x - 2, y - 2, sz.cx + 2, sz.cy + 2);

 }

 

-bool MyBitmap::loadFromFile(TCHAR *fn)

+bool MyBitmap::loadFromFile(wchar_t *fn)

 {

 	if (bits) free();

 

diff --git a/plugins/SplashScreen/src/bitmap_funcs.h b/plugins/SplashScreen/src/bitmap_funcs.h
index 35be6683db..851b746e4d 100644
--- a/plugins/SplashScreen/src/bitmap_funcs.h
+++ b/plugins/SplashScreen/src/bitmap_funcs.h
@@ -26,10 +26,10 @@ private:
 public:

 	MyBitmap();

 	MyBitmap(int w, int h);

-	MyBitmap(TCHAR *fn);

+	MyBitmap(wchar_t *fn);

 	~MyBitmap();

 

-	bool loadFromFile(TCHAR *fn);

+	bool loadFromFile(wchar_t *fn);

 

 	int getWidth() { return width; }

 	int getHeight() { return height; }

@@ -43,7 +43,7 @@ public:
 	void saveAlpha(int x = 0, int y = 0, int w = 0, int h = 0);

 	void restoreAlpha(int x = 0, int y = 0, int w = 0, int h = 0);

 	

-	void DrawText(TCHAR *str, int x, int y);

+	void DrawText(wchar_t *str, int x, int y);

 

 	inline COLOR32 *getBits() { return bits; }

 	inline COLOR32 *getRow(int row) { return bits + row * width; }

diff --git a/plugins/SplashScreen/src/debug.h b/plugins/SplashScreen/src/debug.h
index 3132433ccb..c283bd30d9 100644
--- a/plugins/SplashScreen/src/debug.h
+++ b/plugins/SplashScreen/src/debug.h
@@ -2,7 +2,7 @@
 #define __debug_h__

 

 #define PlugName "SplashScreen"

-extern TCHAR szLogFile[MAX_PATH];

+extern wchar_t szLogFile[MAX_PATH];

 

 /*

  * output a notification message.

@@ -11,10 +11,10 @@ extern TCHAR szLogFile[MAX_PATH];
  *

  */

 

-int inline _DebugPopup(MCONTACT hContact, TCHAR *fmt, ...)

+int inline _DebugPopup(MCONTACT hContact, wchar_t *fmt, ...)

 {

 	va_list va;

-	TCHAR debug[1024];

+	wchar_t debug[1024];

 

 	va_start(va, fmt);

 	mir_sntprintf(debug, fmt, va);

@@ -24,9 +24,9 @@ int inline _DebugPopup(MCONTACT hContact, TCHAR *fmt, ...)
 		ppd.lchContact = hContact;

 		ppd.lchIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 		if(hContact != 0)

-			mir_tstrncpy(ppd.lptzContactName, (TCHAR*)pcli->pfnGetContactDisplayName(hContact, 0), MAX_CONTACTNAME);

+			mir_tstrncpy(ppd.lptzContactName, (wchar_t*)pcli->pfnGetContactDisplayName(hContact, 0), MAX_CONTACTNAME);

 		else

-			mir_tstrncpy(ppd.lptzContactName, _T(PlugName), MAX_CONTACTNAME);

+			mir_tstrncpy(ppd.lptzContactName, _A2W(PlugName), MAX_CONTACTNAME);

 		mir_tstrncpy(ppd.lptzText, debug, MAX_SECONDLINE - 20);

 		ppd.colorText = RGB(255,255,255);

 		ppd.colorBack = RGB(255,0,0);

@@ -41,7 +41,7 @@ int inline _DebugPopup(MCONTACT hContact, TCHAR *fmt, ...)
 

 int inline initLog()

 {

-	fclose(_tfopen(szLogFile, L"w"));

+	fclose(_wfopen(szLogFile, L"w"));

 	return 0;

 }

 

@@ -49,10 +49,10 @@ int inline initLog()
  * logging func

  */

 

-void inline logMessage(TCHAR *func, TCHAR *msg)

+void inline logMessage(wchar_t *func, wchar_t *msg)

 {

-	FILE *f = _tfopen(szLogFile, L"a");

-	_ftprintf(f, L"%s:\t\t%s\n", func, msg);

+	FILE *f = _wfopen(szLogFile, L"a");

+	fwprintf(f, L"%s:\t\t%s\n", func, msg);

 	fclose(f);

 }

 

diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp
index 74eeb0ff7c..0a88380ac3 100644
--- a/plugins/SplashScreen/src/main.cpp
+++ b/plugins/SplashScreen/src/main.cpp
@@ -31,11 +31,11 @@ BOOL bmodulesloaded = false; // modules are loaded
 BOOL png2dibavail = true; // can we use png2dib service?

 

 // path to miranda's dir, config file path, splash path, sound path

-TCHAR szDllName[MAX_PATH], szSplashFile[MAX_PATH], szSoundFile[MAX_PATH], szhAdvaimgPath[MAX_PATH], szPrefix[128], inBuf[80];

-TCHAR *szMirDir;

+wchar_t szDllName[MAX_PATH], szSplashFile[MAX_PATH], szSoundFile[MAX_PATH], szhAdvaimgPath[MAX_PATH], szPrefix[128], inBuf[80];

+wchar_t *szMirDir;

 char szVersion[MAX_PATH];

 #ifdef _DEBUG

-TCHAR szLogFile[MAX_PATH];

+wchar_t szLogFile[MAX_PATH];

 #endif

 SPLASHOPTS options;

 HWND hwndSplash;

@@ -69,12 +69,12 @@ void SplashMain()
 		CallService(MS_SYSTEM_GETVERSIONTEXT, MAX_PATH, (LPARAM)szVersion);

 

 		#ifdef _DEBUG

-		mir_sntprintf(szLogFile, L"%s\\%s.log", szMirDir, _T(__PLUGIN_NAME));

+		mir_sntprintf(szLogFile, L"%s\\%s.log", szMirDir, _A2W(__PLUGIN_NAME));

 		initLog();

-		TCHAR *mirandaVerString = mir_a2t(szVersion);

+		wchar_t *mirandaVerString = mir_a2t(szVersion);

 		logMessage(L"Miranda version", mirandaVerString);

 		mir_free(mirandaVerString);

-		logMessage(L"Dll Name", _T(__FILENAME));

+		logMessage(L"Dll Name", _A2W(__FILENAME));

 		logMessage(L"Advaimg path", szhAdvaimgPath);

 		#endif

 

@@ -94,15 +94,14 @@ void SplashMain()
 			mir_tstrcpy(inBuf, dbv.ptszVal);

 			db_free(&dbv);

 		}

-		else

-			mir_tstrcpy(inBuf, L"splash\\splash.png");

+		else mir_tstrcpy(inBuf, L"splash\\splash.png");

 

-		TCHAR szExpandedSplashFile[MAX_PATH];

+		wchar_t szExpandedSplashFile[MAX_PATH];

 		ExpandEnvironmentStrings(inBuf, szExpandedSplashFile, _countof(szExpandedSplashFile));

 		mir_tstrcpy(inBuf, szExpandedSplashFile);

 

-		TCHAR *pos3 = 0;

-		pos3 = _tcsrchr(inBuf, _T(':'));

+		wchar_t *pos3 = 0;

+		pos3 = wcsrchr(inBuf, ':');

 		if (pos3 == NULL)

 			mir_sntprintf(szSplashFile, L"%s\\%s", szMirDir, inBuf);

 		else

@@ -112,15 +111,14 @@ void SplashMain()
 			mir_tstrcpy(inBuf, dbv.ptszVal);

 			db_free(&dbv);

 		}

-		else

-			mir_tstrcpy(inBuf, L"sounds\\startup.wav");

+		else mir_tstrcpy(inBuf, L"sounds\\startup.wav");

 

-		TCHAR szExpandedSoundFile[MAX_PATH];

+		wchar_t szExpandedSoundFile[MAX_PATH];

 		ExpandEnvironmentStrings(inBuf, szExpandedSoundFile, _countof(szExpandedSoundFile));

 		mir_tstrcpy(inBuf, szExpandedSoundFile);

 

-		TCHAR *pos2;

-		pos2 = _tcschr(inBuf, _T(':'));

+		wchar_t *pos2;

+		pos2 = wcschr(inBuf, ':');

 		if (pos2 == NULL)

 			mir_sntprintf(szSoundFile, L"%s\\%s", szMirDir, inBuf);

 		else

@@ -130,19 +128,19 @@ void SplashMain()
 		logMessage(L"SoundFilePath", szSoundFile);

 		#endif

 

-		TCHAR szOldPath[MAX_PATH] = { 0 };

+		wchar_t szOldPath[MAX_PATH] = { 0 };

 

 		if (options.random) // randomly select a splash file

 		{

 			int filescount = 0;

-			TCHAR szSplashDir[MAX_PATH] = { 0 }, szSearch[MAX_PATH] = { 0 };

-			TCHAR *p = 0;

-			TCHAR files[255][50]; //TODO: make memory allocation dynamic

+			wchar_t szSplashDir[MAX_PATH] = { 0 }, szSearch[MAX_PATH] = { 0 };

+			wchar_t *p = 0;

+			wchar_t files[255][50]; //TODO: make memory allocation dynamic

 

 			mir_tstrcpy(szSplashDir, szSplashFile);

 			mir_tstrcpy(szOldPath, szSplashFile);

 			// find the last \ and null it out, this leaves no trailing slash

-			p = _tcsrchr(szSplashDir, _T('\\'));

+			p = wcsrchr(szSplashDir, '\\');

 			if (p) *p = 0;

 			// create the search filter

 			mir_sntprintf(szSearch, L"%s\\*.*", szSplashDir);

@@ -158,7 +156,7 @@ void SplashMain()
 						#endif

 						//files = new char[mir_strlen(ffd.cFileName)];

 						//files[filescount] = new char[mir_strlen(ffd.cFileName)];

-						TCHAR ext[5];

+						wchar_t ext[5];

 						wmemcpy(ext, ffd.cFileName + (mir_tstrlen(ffd.cFileName) - 4), 5);

 

 						#ifdef _DEBUG

@@ -197,7 +195,7 @@ void SplashMain()
 int PlugDisableHook(WPARAM wParam, LPARAM lParam)

 {

 	#ifdef _DEBUG

-	TCHAR buf[128];

+	wchar_t buf[128];

 	#endif

 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

 	if (options.inheritGS) {

@@ -207,7 +205,7 @@ int PlugDisableHook(WPARAM wParam, LPARAM lParam)
 			cws->value.bVal ? _DebugPopup(NULL, L"Sounds enabled.", L"") : _DebugPopup(NULL, L"Sounds disabled.", L"");

 			logMessage(L"Module", _A2T(cws->szModule));

 			logMessage(L"Setting", _A2T(cws->szSetting));

-			logMessage(L"Value", _itot(cws->value.bVal, buf, 10));

+			logMessage(L"Value", _itow(cws->value.bVal, buf, 10));

 			#endif

 		}

 		if (!strcmp(cws->szModule, "PluginDisable") && !strcmp(cws->szSetting, _T2A(szDllName))) {

@@ -217,7 +215,7 @@ int PlugDisableHook(WPARAM wParam, LPARAM lParam)
 			logMessage(L"PlugDisableHook", L"Triggered");

 			logMessage(L"Module", _A2T(cws->szModule));

 			logMessage(L"Setting", _A2T(cws->szSetting));

-			logMessage(L"Value", _itot(cws->value.bVal, buf, 10));

+			logMessage(L"Value", _itow(cws->value.bVal, buf, 10));

 			#endif

 		}

 	}

@@ -271,7 +269,7 @@ extern "C" int __declspec(dllexport) Load(void)
 

 extern "C" int __declspec(dllexport) Unload(void)

 {

-	UnregisterClass(_T(SPLASH_CLASS), hInst);

+	UnregisterClass(SPLASH_CLASS, hInst);

 

 	// Freeing loaded libraries

 	if (hAdvaimg)

diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp
index 845a016ab4..f68eac44be 100644
--- a/plugins/SplashScreen/src/options.cpp
+++ b/plugins/SplashScreen/src/options.cpp
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

 #include "stdafx.h"

 

-TCHAR szPath2Spash[MAX_PATH], szSoundFilePath[MAX_PATH];

+wchar_t szPath2Spash[MAX_PATH], szSoundFilePath[MAX_PATH];

 

 // Reads values from db

 void ReadDbConfig()

@@ -66,7 +66,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			}

 			else {

 				ReadDbConfig();

-				TCHAR inBuf[80];

+				wchar_t inBuf[80];

 				DBVARIANT dbv = { 0 };

 				if (!db_get_ts(NULL, MODNAME, "Path", &dbv)) {

 					mir_tstrcpy(inBuf, dbv.ptszVal);

@@ -108,9 +108,9 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				if (options.showversion)

 					CheckDlgButton(hwndDlg, IDC_SHOWVERSION, BST_CHECKED);

 

-				SetDlgItemText(hwndDlg, IDC_SHOWTIME, _itot(options.showtime, inBuf, 10));

-				SetDlgItemText(hwndDlg, IDC_FISTEP, _itot(options.fisteps, inBuf, 10));

-				SetDlgItemText(hwndDlg, IDC_FOSTEP, _itot(options.fosteps, inBuf, 10));

+				SetDlgItemText(hwndDlg, IDC_SHOWTIME, _itow(options.showtime, inBuf, 10));

+				SetDlgItemText(hwndDlg, IDC_FISTEP, _itow(options.fisteps, inBuf, 10));

+				SetDlgItemText(hwndDlg, IDC_FOSTEP, _itow(options.fosteps, inBuf, 10));

 

 				SendDlgItemMessage(hwndDlg, IDC_SHOWTIME, EM_LIMITTEXT, 5, 0);

 			}

@@ -166,11 +166,11 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 			case IDC_CHOOSESPLASH:

 				{

-					TCHAR szTempPath[MAX_PATH], initDir[MAX_PATH];

+					wchar_t szTempPath[MAX_PATH], initDir[MAX_PATH];

 

 					if (Exists(szSplashFile)) {

 						mir_tstrcpy(initDir, szSplashFile);

-						TCHAR *pos = _tcsrchr(initDir, _T('\\'));

+						wchar_t *pos = wcsrchr(initDir, '\\');

 						if (pos != NULL)

 							*pos = 0;

 					}

@@ -180,7 +180,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 						mir_free(szMirDir);

 					}

 

-					TCHAR tmp[MAX_PATH];

+					wchar_t tmp[MAX_PATH];

 					mir_sntprintf(tmp, L"%s (*.png, *.bmp)%c*.png;*.bmp%c%c", TranslateT("Graphic files"), 0, 0, 0);

 

 					OPENFILENAME ofn = { 0 };

@@ -204,7 +204,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 						int result = PathToRelativeT(szTempPath, szPath2Spash);

 						if (result && mir_tstrlen(szPath2Spash) > 0) {

 							if (options.random) {

-								TCHAR *pos = _tcsrchr(szPath2Spash, _T('\\'));

+								wchar_t *pos = wcsrchr(szPath2Spash, '\\');

 								if (pos != NULL) {

 									*pos = 0;

 									mir_tstrcat(szPath2Spash, L"\\");

@@ -222,12 +222,12 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 			case IDC_CHOOSESND:

 				{

-					TCHAR szTempPath[MAX_PATH], initDir[MAX_PATH];

-					TCHAR *pos;

+					wchar_t szTempPath[MAX_PATH], initDir[MAX_PATH];

+					wchar_t *pos;

 

 					if (Exists(szSoundFile)) {

 						mir_tstrcpy(initDir, szSoundFile);

-						pos = _tcsrchr(initDir, _T('\\'));

+						pos = wcsrchr(initDir, '\\');

 						if (pos != NULL) *pos = 0;

 					}

 					else {

@@ -238,7 +238,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 					OPENFILENAME ofn = { 0 };

 					ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;

-					TCHAR tmp[MAX_PATH];

+					wchar_t tmp[MAX_PATH];

 					mir_sntprintf(tmp, L"%s (*.wav, *.mp3)%c*.wav;*.mp3%c%c", TranslateT("Sound Files"), 0, 0, 0);

 					ofn.lpstrFilter = tmp;

 					ofn.hwndOwner = 0;

@@ -285,7 +285,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				switch (((LPNMHDR)lParam)->code) {

 				case PSN_APPLY:

 					{

-						TCHAR tmp[MAX_PATH];

+						wchar_t tmp[MAX_PATH];

 

 						GetDlgItemText(hwndDlg, IDC_SPLASHPATH, tmp, _countof(tmp));

 						db_set_ts(NULL, MODNAME, "Path", tmp);

@@ -298,16 +298,16 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 						mir_tstrcpy(szPrefix, tmp);

 

 						GetDlgItemText(hwndDlg, IDC_SHOWTIME, tmp, _countof(tmp));

-						db_set_dw(NULL, MODNAME, "TimeToShow", _ttoi(tmp));

-						options.showtime = _ttoi(tmp);

+						db_set_dw(NULL, MODNAME, "TimeToShow", _wtoi(tmp));

+						options.showtime = _wtoi(tmp);

 

 						GetDlgItemText(hwndDlg, IDC_FISTEP, tmp, _countof(tmp));

-						db_set_dw(NULL, MODNAME, "FadeinSpeed", _ttoi(tmp));

-						options.fisteps = _ttoi(tmp);

+						db_set_dw(NULL, MODNAME, "FadeinSpeed", _wtoi(tmp));

+						options.fisteps = _wtoi(tmp);

 

 						GetDlgItemText(hwndDlg, IDC_FOSTEP, tmp, _countof(tmp));

-						db_set_dw(NULL, MODNAME, "FadeoutSpeed", _ttoi(tmp));

-						options.fosteps = _ttoi(tmp);

+						db_set_dw(NULL, MODNAME, "FadeoutSpeed", _wtoi(tmp));

+						options.fosteps = _wtoi(tmp);

 

 						if (IsDlgButtonChecked(hwndDlg, IDC_ACTIVE)) {

 							db_set_b(NULL, MODNAME, "Active", 1);

diff --git a/plugins/SplashScreen/src/services.cpp b/plugins/SplashScreen/src/services.cpp
index e7aa6c7a66..7a9e35cc69 100644
--- a/plugins/SplashScreen/src/services.cpp
+++ b/plugins/SplashScreen/src/services.cpp
@@ -22,14 +22,14 @@
 INT_PTR ShowSplashService(WPARAM wparam, LPARAM lparam)

 {

 	bserviceinvoked = true;

-	TCHAR szOldfn[256];

-	TCHAR *filename = (TCHAR*)wparam;

+	wchar_t szOldfn[256];

+	wchar_t *filename = (wchar_t*)wparam;

 	int timetoshow = (int)lparam;

 

 	mir_tstrcpy(szOldfn, szSplashFile);

 	options.showtime = timetoshow;

 

-	TCHAR *pos = _tcsrchr(filename, _T(':'));

+	wchar_t *pos = wcsrchr(filename, ':');

 	if (pos == NULL)

 		mir_sntprintf(szSplashFile, L"%s\\%s", szMirDir, filename);

 	else

diff --git a/plugins/SplashScreen/src/splash.cpp b/plugins/SplashScreen/src/splash.cpp
index 9e209b906a..c3cafffbc6 100644
--- a/plugins/SplashScreen/src/splash.cpp
+++ b/plugins/SplashScreen/src/splash.cpp
@@ -41,7 +41,7 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 	case WM_TIMER:

 

 #ifdef _DEBUG

-		TCHAR b[40];

+		wchar_t b[40];

 		mir_sntprintf(b, L"%d", wParam);

 		logMessage(L"Timer ID", b);

 		mir_sntprintf(b, L"%d", options.showtime);

@@ -152,7 +152,7 @@ void __cdecl SplashThread(void *arg)
 	wcl.hCursor = LoadCursor(NULL, IDC_ARROW);

 	wcl.hbrBackground = (HBRUSH)GetStockObject(LTGRAY_BRUSH);

 	wcl.lpszMenuName = NULL;

-	wcl.lpszClassName = _T(SPLASH_CLASS);

+	wcl.lpszClassName = SPLASH_CLASS;

 	wcl.hIconSm = NULL;

 	RegisterClassEx(&wcl);

 

@@ -172,7 +172,7 @@ void __cdecl SplashThread(void *arg)
 

 	hwndSplash = CreateWindowEx(

 		WS_EX_TOOLWINDOW | WS_EX_TOPMOST,//dwStyleEx

-		_T(SPLASH_CLASS), //Class name

+		SPLASH_CLASS, //Class name

 		NULL, //Title

 		DS_SETFONT | DS_FIXEDSYS | WS_POPUP, //dwStyle

 		WindowRect.left, // x

@@ -227,8 +227,8 @@ void __cdecl SplashThread(void *arg)
 				}

 			}

 

-		TCHAR verString[256] = { 0 };

-		TCHAR *mirandaVerString = mir_a2t(szVersion);

+		wchar_t verString[256] = { 0 };

+		wchar_t *mirandaVerString = mir_a2t(szVersion);

 		mir_sntprintf(verString, L"%s%s", szPrefix, mirandaVerString);

 		mir_free(mirandaVerString);

 		LOGFONT lf = { 0 };

@@ -326,7 +326,7 @@ BOOL ShowSplash(BOOL bpreview)
 	else {

 		timeout = options.showtime;

 #ifdef _DEBUG

-		TCHAR b[40];

+		wchar_t b[40];

 		mir_sntprintf(b, L"%d", options.showtime);

 		logMessage(L"Timeout", b);

 #endif

diff --git a/plugins/SplashScreen/src/stdafx.h b/plugins/SplashScreen/src/stdafx.h
index 070026efa2..dd1217124b 100644
--- a/plugins/SplashScreen/src/stdafx.h
+++ b/plugins/SplashScreen/src/stdafx.h
@@ -22,8 +22,8 @@
 

 #define _CRT_SECURE_NO_DEPRECATE

 

-#include <windows.h>

 #include <tchar.h>

+#include <windows.h>

 #include <time.h>

 #include <dshow.h>

 

@@ -48,7 +48,7 @@
 #endif

 

 // Internal defines

-#define SPLASH_CLASS "MirandaSplash"

+#define SPLASH_CLASS L"MirandaSplash"

 #define MODNAME "SplashScreen"

 #define WM_LOADED (WM_USER + 10)

 

@@ -68,8 +68,8 @@ struct SPLASHOPTS
 

 extern HWND hwndSplash;

 extern SPLASHOPTS options;

-extern TCHAR szSplashFile[MAX_PATH], szSoundFile[MAX_PATH], szPrefix[128];

-extern TCHAR *szMirDir;

+extern wchar_t szSplashFile[MAX_PATH], szSoundFile[MAX_PATH], szPrefix[128];

+extern wchar_t *szMirDir;

 extern char szVersion[MAX_PATH];

 extern BOOL bserviceinvoked, bmodulesloaded, png2dibavail;

 extern HINSTANCE hInst;