From 867acc8fe919830f4735ccfe8b9d99dc49319c90 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 19 Jan 2013 13:59:37 +0000 Subject: - Another portion of _T replacement when it's not needed (from person) git-svn-id: http://svn.miranda-ng.org/main/trunk@3169 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SplashScreen/src/debug.h | 6 +++--- plugins/SplashScreen/src/options.cpp | 22 ++++++++++---------- plugins/SplashScreen/src/services.cpp | 6 +++--- plugins/SplashScreen/src/splash.cpp | 38 +++++++++++++++++------------------ 4 files changed, 36 insertions(+), 36 deletions(-) (limited to 'plugins/SplashScreen/src') diff --git a/plugins/SplashScreen/src/debug.h b/plugins/SplashScreen/src/debug.h index 70e36dfaed..62c1a0a7d8 100644 --- a/plugins/SplashScreen/src/debug.h +++ b/plugins/SplashScreen/src/debug.h @@ -43,7 +43,7 @@ int inline _DebugPopup(HANDLE hContact, TCHAR *fmt, ...) int inline initLog() { - fclose(_tfopen(szLogFile, _T("w"))); + fclose(_tfopen(szLogFile, L"w")); return 0; } @@ -53,8 +53,8 @@ int inline initLog() void inline logMessage(TCHAR *func, TCHAR *msg) { - FILE *f = _tfopen(szLogFile, _T("a")); - _ftprintf(f, _T("%s:\t\t%s\n"), func, msg); + FILE *f = _tfopen(szLogFile, L"a"); + _ftprintf(f, L"%s:\t\t%s\n", func, msg); fclose(f); } diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp index 6d5cf7c553..d88b6938ee 100644 --- a/plugins/SplashScreen/src/options.cpp +++ b/plugins/SplashScreen/src/options.cpp @@ -63,7 +63,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DBGetContactSettingTString(NULL, MODNAME, "Path", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(inBuf, _T("splash\\splash.png")); + _tcscpy_s(inBuf, L"splash\\splash.png"); DBFreeVariant(&dbv); } else @@ -73,7 +73,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DBGetContactSettingTString(NULL, MODNAME, "Sound", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(inBuf, _T("sounds\\startup.wav")); + _tcscpy_s(inBuf, L"sounds\\startup.wav"); DBFreeVariant(&dbv); } else @@ -83,7 +83,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DBGetContactSettingTString(NULL, MODNAME, "VersionPrefix", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(inBuf, _T("")); + _tcscpy_s(inBuf, L""); DBFreeVariant(&dbv); } else @@ -178,7 +178,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } else { - szMirDir = Utils_ReplaceVarsT(_T("%miranda_path%")); + szMirDir = Utils_ReplaceVarsT(L"%miranda_path%"); lstrcpy(initDir, szMirDir); mir_free(szMirDir); } @@ -186,7 +186,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]; - mir_sntprintf(tmp, SIZEOF(tmp), _T("%s (*.png, *.bmp)%c*.png;*.bmp%c%c"), TranslateT("Graphic files"), 0, 0, 0); + mir_sntprintf(tmp, SIZEOF(tmp), L"%s (*.png, *.bmp)%c*.png;*.bmp%c%c", TranslateT("Graphic files"), 0, 0, 0); ofn.lpstrFilter = tmp; ofn.hwndOwner = 0; ofn.lpstrFile = szTempPath; @@ -195,14 +195,14 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP ofn.Flags = OFN_HIDEREADONLY; ofn.lpstrInitialDir = initDir; *szTempPath = '\0'; - ofn.lpstrDefExt = _T(""); + ofn.lpstrDefExt = L""; if (GetOpenFileName(&ofn)) { lstrcpy(szSplashFile, szTempPath); #ifdef _DEBUG - logMessage(_T("Set path"), szSplashFile); + logMessage(L"Set path", szSplashFile); #endif // Make path relative @@ -243,7 +243,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } else { - szMirDir = Utils_ReplaceVarsT(_T("%miranda_path%")); + szMirDir = Utils_ReplaceVarsT(L"%miranda_path%"); lstrcpy(initDir, szMirDir); mir_free(szMirDir); } @@ -251,7 +251,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]; - mir_sntprintf(tmp, SIZEOF(tmp), _T("%s (*.wav, *.mp3)%c*.wav;*.mp3%c%c"), TranslateT("Sound Files"), 0, 0, 0); + mir_sntprintf(tmp, SIZEOF(tmp), L"%s (*.wav, *.mp3)%c*.wav;*.mp3%c%c", TranslateT("Sound Files"), 0, 0, 0); ofn.lpstrFilter = tmp; ofn.hwndOwner = 0; ofn.lpstrFile = szTempPath; @@ -260,14 +260,14 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP ofn.Flags = OFN_HIDEREADONLY; ofn.lpstrInitialDir = initDir; *szTempPath = '\0'; - ofn.lpstrDefExt = _T(""); + ofn.lpstrDefExt = L""; if (GetOpenFileName(&ofn)) { lstrcpy(szSoundFile,szTempPath); #ifdef _DEBUG - logMessage(_T("Set sound path"), szSoundFile); + logMessage(L"Set sound path", szSoundFile); #endif // Make path relative diff --git a/plugins/SplashScreen/src/services.cpp b/plugins/SplashScreen/src/services.cpp index f38c8eeb8f..1dfe6ee5fb 100644 --- a/plugins/SplashScreen/src/services.cpp +++ b/plugins/SplashScreen/src/services.cpp @@ -32,7 +32,7 @@ INT_PTR ShowSplashService(WPARAM wparam,LPARAM lparam) pos = _tcsrchr(filename, _T(':')); if (pos == NULL) - mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), _T("%s\\%s"), szMirDir, filename); + mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), L"%s\\%s", szMirDir, filename); else lstrcpy(szSplashFile, filename); @@ -50,7 +50,7 @@ INT_PTR TestService(WPARAM wParam,LPARAM lParam) OPENFILENAME ofn={0}; ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; - ofn.lpstrFilter = _T("PNG and BMP files\0*.png;*.bmp\0\0"); + ofn.lpstrFilter = L"PNG and BMP files\0*.png;*.bmp\0\0"; ofn.hwndOwner=0; ofn.lpstrFile = szTempPath; ofn.nMaxFile = MAX_PATH; @@ -58,7 +58,7 @@ INT_PTR TestService(WPARAM wParam,LPARAM lParam) ofn.Flags = OFN_HIDEREADONLY; ofn.lpstrInitialDir = szSplashFile; *szTempPath = '\0'; - ofn.lpstrDefExt = _T(""); + ofn.lpstrDefExt = L""; if (GetOpenFileName(&ofn)) CallService(MS_SHOWSPLASH,(WPARAM)szTempPath,0); diff --git a/plugins/SplashScreen/src/splash.cpp b/plugins/SplashScreen/src/splash.cpp index 196c4adedd..aa7e4eba6e 100644 --- a/plugins/SplashScreen/src/splash.cpp +++ b/plugins/SplashScreen/src/splash.cpp @@ -29,7 +29,7 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM case WM_LOADED: { #ifdef _DEBUG - logMessage(_T("WM_LOADED"), _T("called")); + logMessage(L"WM_LOADED", L"called"); #endif if (!MyUpdateLayeredWindow) ShowWindow(hwndSplash, SW_SHOWNORMAL); @@ -46,10 +46,10 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM #ifdef _DEBUG TCHAR b [40]; - mir_sntprintf(b, SIZEOF(b), _T("%d"), wParam); - logMessage(_T("Timer ID"), b); - mir_sntprintf(b, SIZEOF(b), _T("%d"), options.showtime); - logMessage(_T("ShowTime value"), b); + mir_sntprintf(b, SIZEOF(b), L"%d", wParam); + logMessage(L"Timer ID", b); + mir_sntprintf(b, SIZEOF(b), L"%d", options.showtime); + logMessage(L"ShowTime value", b); #endif if (options.showtime > 0) //TimeToShow enabled @@ -58,7 +58,7 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM { PostMessage(hwnd, WM_CLOSE, 0, 0); #ifdef _DEBUG - logMessage(_T("Showtime timer"), _T("triggered")); + logMessage(L"Showtime timer"), L"triggered"); #endif } } @@ -68,13 +68,13 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM if (wParam == 7) { #ifdef _DEBUG - logMessage(_T("On Modules Loaded timer"), _T("triggered")); + logMessage(L"On Modules Loaded timer", L"triggered"); #endif } if (wParam == 8) { #ifdef _DEBUG - logMessage(_T("On Modules Loaded workaround"), _T("triggered")); + logMessage(L"On Modules Loaded workaround", L"triggered"); #endif } } @@ -133,7 +133,7 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM { PostQuitMessage(0); #ifdef _DEBUG - logMessage(_T("WM_DESTROY"), _T("called")); + logMessage(L"WM_DESTROY", L"called"); #endif break; } @@ -262,11 +262,11 @@ int SplashThread(void *arg) TCHAR verString[256] = {0}; TCHAR* mirandaVerString = mir_a2t(szVersion); - mir_sntprintf(verString, SIZEOF(verString), _T("%s%s"), szPrefix, mirandaVerString); + mir_sntprintf(verString, SIZEOF(verString), L"%s%s", szPrefix, mirandaVerString); mir_free(mirandaVerString); LOGFONT lf = {0}; lf.lfHeight = 14; - _tcscpy_s(lf.lfFaceName, _T("Verdana")); + _tcscpy_s(lf.lfFaceName, L"Verdana"); SelectObject(SplashBmp->getDC(), CreateFontIndirect(&lf)); if (!splashWithMarkers) { @@ -317,7 +317,7 @@ int SplashThread(void *arg) if (SetTimer(hwndSplash, 6, DWORD(arg), 0)) { #ifdef _DEBUG - logMessage(_T("Timer TimeToShow"), _T("set")); + logMessage(L"Timer TimeToShow", L"set"); #endif } } @@ -327,7 +327,7 @@ int SplashThread(void *arg) if (SetTimer(hwndSplash, 8, 2000, 0)) { #ifdef _DEBUG - logMessage(_T("Timer Modules loaded"), _T("set")); + logMessage(L"Timer Modules loaded", L"set"); #endif } } @@ -361,7 +361,7 @@ BOOL ShowSplash(BOOL bpreview) SplashBmp = new MyBitmap; #ifdef _DEBUG - logMessage(_T("Loading splash file"), szSplashFile); + logMessage(L"Loading splash file", szSplashFile); #endif SplashBmp->loadFromFile(szSplashFile, NULL); @@ -369,7 +369,7 @@ BOOL ShowSplash(BOOL bpreview) DWORD threadID; #ifdef _DEBUG - logMessage(_T("Thread"), _T("start")); + logMessage(L"Thread", L"start"); #endif if (bpreview) @@ -379,7 +379,7 @@ BOOL ShowSplash(BOOL bpreview) timeout = 2000; #ifdef _DEBUG - logMessage(_T("Preview"), _T("yes")); + logMessage(L"Preview", L"yes"); #endif } else @@ -387,15 +387,15 @@ BOOL ShowSplash(BOOL bpreview) timeout = options.showtime; #ifdef _DEBUG TCHAR b [40]; - mir_sntprintf(b, SIZEOF(b), _T("%d"), options.showtime); - logMessage(_T("Timeout"), b); + mir_sntprintf(b, SIZEOF(b), L"%d", options.showtime); + logMessage(L"Timeout", b); #endif } hSplashThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)SplashThread, (LPVOID)timeout, 0, &threadID); #ifdef _DEBUG - logMessage(_T("Thread"), _T("end")); + logMessage(L"Thread", L"end"); #endif CloseHandle(hSplashThread); -- cgit v1.2.3