From b4b33384b4bce30863d9d01aa6e0b60f588d281d Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 19 Jan 2013 17:02:36 +0000 Subject: - Another portion of _T replacement and fixes of previous commits (patch from person) git-svn-id: http://svn.miranda-ng.org/main/trunk@3173 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SplashScreen/src/bitmap_funcs.cpp | 6 +-- plugins/SplashScreen/src/debug.h | 6 +-- plugins/SplashScreen/src/main.cpp | 70 +++++++++++++++---------------- plugins/SplashScreen/src/options.cpp | 22 +++++----- plugins/SplashScreen/src/services.cpp | 6 +-- plugins/SplashScreen/src/splash.cpp | 38 ++++++++--------- 6 files changed, 74 insertions(+), 74 deletions(-) (limited to 'plugins/SplashScreen/src') diff --git a/plugins/SplashScreen/src/bitmap_funcs.cpp b/plugins/SplashScreen/src/bitmap_funcs.cpp index 46792eed26..f6f2ce5f4b 100644 --- a/plugins/SplashScreen/src/bitmap_funcs.cpp +++ b/plugins/SplashScreen/src/bitmap_funcs.cpp @@ -210,7 +210,7 @@ bool MyBitmap::loadFromFile(TCHAR *fn, TCHAR *fnAlpha) TCHAR *ext; ext = &fn[lstrlen(fn)-4]; - if (!lstrcmpi(ext, L".png")) + if (!lstrcmpi(ext, _T(".png"))) { HANDLE hFile, hMap = NULL; BYTE* ppMap = NULL; @@ -238,7 +238,7 @@ bool MyBitmap::loadFromFile(TCHAR *fn, TCHAR *fnAlpha) else cbFileSize = 0; #ifdef _DEBUG - logMessage(L"Loading splash file", L"done"); + logMessage(_T("Loading splash file"), _T("done")); #endif } @@ -301,7 +301,7 @@ bool MyBitmap::loadFromFile(TCHAR *fn, TCHAR *fnAlpha) if (!hBmpLoaded) { #ifdef _DEBUG - logMessage(L"MyBitmap::loadFromFile", L"Bitmap load failed"); + logMessage(_T("MyBitmap::loadFromFile"), _T("Bitmap load failed")); #endif return false; } diff --git a/plugins/SplashScreen/src/debug.h b/plugins/SplashScreen/src/debug.h index 62c1a0a7d8..70e36dfaed 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, L"w")); + fclose(_tfopen(szLogFile, _T("w"))); return 0; } @@ -53,8 +53,8 @@ int inline initLog() void inline logMessage(TCHAR *func, TCHAR *msg) { - FILE *f = _tfopen(szLogFile, L"a"); - _ftprintf(f, L"%s:\t\t%s\n", func, msg); + FILE *f = _tfopen(szLogFile, _T("a")); + _ftprintf(f, _T("%s:\t\t%s\n"), func, msg); fclose(f); } diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp index 9b55118edc..4aeeb26813 100644 --- a/plugins/SplashScreen/src/main.cpp +++ b/plugins/SplashScreen/src/main.cpp @@ -73,18 +73,18 @@ void SplashMain() if (bstartup) { // Retrive path to exe of current running Miranda is located - szMirDir = Utils_ReplaceVarsT(L"%miranda_path%"); - mir_sntprintf(szhAdvaimgPath, SIZEOF(szhAdvaimgPath), L"%s\\plugins\\advaimg.dll", szMirDir); + szMirDir = Utils_ReplaceVarsT(_T("%miranda_path%")); + mir_sntprintf(szhAdvaimgPath, SIZEOF(szhAdvaimgPath), _T("%s\\plugins\\advaimg.dll"), szMirDir); CallService(MS_SYSTEM_GETVERSIONTEXT, MAX_PATH, (LPARAM)szVersion); #ifdef _DEBUG - mir_sntprintf(szLogFile, SIZEOF(szLogFile), L"%s\\%s.log", szMirDir, _T(__PLUGIN_NAME)); + mir_sntprintf(szLogFile, SIZEOF(szLogFile), _T("%s\\%s.log"), szMirDir, _T(__PLUGIN_NAME)); initLog(); TCHAR* mirandaVerString = mir_a2t(szVersion); - logMessage(L"Miranda version", mirandaVerString); + logMessage(_T("Miranda version"), mirandaVerString); mir_free(mirandaVerString); - logMessage(L"Dll Name", _T(__FILENAME)); - logMessage(L"Advaimg path", szhAdvaimgPath); + logMessage(_T("Dll Name"), _T(__FILENAME)); + logMessage(_T("Advaimg path"), szhAdvaimgPath); #endif ReadIniConfig(); @@ -100,7 +100,7 @@ void SplashMain() if (hUserDll == NULL) { - hUserDll = LoadLibrary(L"user32.dll"); + hUserDll = LoadLibrary(_T("user32.dll")); if (hUserDll) MyUpdateLayeredWindow = (BOOL (WINAPI *)(HWND, HDC, POINT *, SIZE *, HDC, POINT *, COLORREF, BLENDFUNCTION *, DWORD))GetProcAddress(hUserDll, "UpdateLayeredWindow"); } @@ -126,7 +126,7 @@ void SplashMain() } #ifdef _DEBUG if (png2dibConvertor) - logMessage(L"Loading advaimg", L"done"); + logMessage(_T("Loading advaimg"), _T("done")); #endif } } @@ -136,7 +136,7 @@ void SplashMain() DBGetContactSettingTString(NULL, MODNAME, "VersionPrefix", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(szPrefix, L""); + _tcscpy_s(szPrefix, _T("")); DBFreeVariant(&dbv); } else @@ -146,7 +146,7 @@ void SplashMain() DBGetContactSettingTString(NULL, MODNAME, "Path", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(inBuf, L"splash\\splash.png"); + _tcscpy_s(inBuf, _T("splash\\splash.png")); DBFreeVariant(&dbv); } else @@ -160,14 +160,14 @@ void SplashMain() TCHAR *pos3 = 0; pos3 = _tcsrchr(inBuf, _T(':')); if (pos3 == NULL) - mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), L"%s\\%s", szMirDir, inBuf); + mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), _T("%s\\%s"), szMirDir, inBuf); else lstrcpy(szSplashFile, inBuf); DBGetContactSettingTString(NULL, MODNAME, "Sound", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(inBuf, L"sounds\\startup.wav"); + _tcscpy_s(inBuf, _T("sounds\\startup.wav")); DBFreeVariant(&dbv); } else @@ -180,12 +180,12 @@ void SplashMain() TCHAR *pos2; pos2 = _tcschr(inBuf, _T(':')); if (pos2 == NULL) - mir_sntprintf(szSoundFile, SIZEOF(szSoundFile), L"%s\\%s", szMirDir, inBuf); + mir_sntprintf(szSoundFile, SIZEOF(szSoundFile), _T("%s\\%s"), szMirDir, inBuf); else lstrcpy(szSoundFile, inBuf); #ifdef _DEBUG - logMessage(L"SoundFilePath", szSoundFile); + logMessage(_T("SoundFilePath"), szSoundFile); #endif TCHAR szOldPath[MAX_PATH] = {0}; @@ -203,7 +203,7 @@ void SplashMain() p = _tcsrchr(szSplashDir, _T('\\')); if (p) *p = 0; // create the search filter - mir_sntprintf(szSearch, SIZEOF(szSearch), L"%s\\*.*", szSplashDir); + mir_sntprintf(szSearch, SIZEOF(szSearch), _T("%s\\*.*"), szSplashDir); // FFFN will return filenames HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATA ffd; @@ -215,7 +215,7 @@ void SplashMain() if (!(ffd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)) { #ifdef _DEBUG - logMessage(L"Found file", ffd.cFileName); + logMessage(_T("Found file"), ffd.cFileName); #endif //files = new char[strlen(ffd.cFileName)]; //files[filescount] = new char[strlen(ffd.cFileName)]; @@ -223,14 +223,14 @@ void SplashMain() tmemcpy(ext, ffd.cFileName + (_tcslen(ffd.cFileName)-4), 5); #ifdef _DEBUG - logMessage(L"Extention", ext); + logMessage(_T("Extention"), ext); #endif - if (lstrcmpi(ext, L".png") & lstrcmpi(ext, L".bmp")) + if (lstrcmpi(ext, _T(".png")) & lstrcmpi(ext, _T(".bmp"))) continue; #ifdef _DEBUG - logMessage(L"File has valid ext", ext); + logMessage(_T("File has valid ext"), ext); #endif _tcscpy_s(files[filescount++], ffd.cFileName); } //if @@ -240,10 +240,10 @@ void SplashMain() int r = 0; if (filescount) r = (rand() % filescount) + 1; - mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), L"%s\\%s", szSplashDir, files[r-1]); + mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), _T("%s\\%s"), szSplashDir, files[r-1]); #ifdef _DEBUG - logMessage(L"final file", szSplashFile); + logMessage(_T("final file"), szSplashFile); #endif FindClose(hFind); } //if @@ -280,25 +280,25 @@ int PlugDisableHook(WPARAM wParam, LPARAM lParam) TCHAR * tszModule= mir_a2t(cws->szModule), *tszSetting = mir_a2t(cws->szSetting); if(options.inheritGS) { - if (!lstrcmp(tszModule, L"Skin") & !lstrcmp(tszSetting, L"UseSound")) + if (!lstrcmp(tszModule, _T("Skin")) & !lstrcmp(tszSetting, _T("UseSound"))) { DBWriteContactSettingByte(NULL, MODNAME, "PlaySound", cws->value.bVal); #ifdef _DEBUG - cws->value.bVal ? _DebugPopup(NULL, L"Sounds enabled.", L"") : _DebugPopup(NULL, L"Sounds disabled.", L""); - logMessage(L"Module", tszModule); - logMessage(L"Setting", tszSetting); - logMessage(L"Value", _itot(cws->value.bVal, buf, 10)); + cws->value.bVal ? _DebugPopup(NULL, _T("Sounds enabled."), _T("")) : _DebugPopup(NULL, _T("Sounds disabled."), _T("")); + logMessage(_T("Module"), tszModule); + logMessage(_T("Setting"), tszSetting); + logMessage(_T("Value"), _itot(cws->value.bVal, buf, 10)); #endif } - if (!lstrcmp(tszModule, L"PluginDisable") & (!lstrcmp(tszSetting, szDllName))) + if (!lstrcmp(tszModule, _T("PluginDisable")) & (!lstrcmp(tszSetting, szDllName))) { DBWriteContactSettingByte(NULL, MODNAME, "Active", cws->value.bVal); #ifdef _DEBUG - cws->value.bVal ? _DebugPopup(NULL, L"Disabled.", "") : _DebugPopup(NULL, L"Enabled.", L""); - logMessage(L"PlugDisableHook", L"Triggered"); - logMessage(L"Module", tszModule); - logMessage(L"Setting", tszSetting); - logMessage(L"Value", _itot(cws->value.bVal, buf, 10)); + cws->value.bVal ? _DebugPopup(NULL, _T("Disabled."), "") : _DebugPopup(NULL, _T("Enabled."), _T("")); + logMessage(_T("PlugDisableHook"), _T("Triggered")); + logMessage(_T("Module"), tszModule); + logMessage(_T("Setting"), tszSetting); + logMessage(_T("Value"), _itot(cws->value.bVal, buf, 10)); #endif } } @@ -317,7 +317,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) if (PostMessage(hwndSplash, WM_LOADED, 0, 0)) { #ifdef _DEBUG - logMessage(L"Posted WM_LOADED message", L"done"); + logMessage(_T("Posted WM_LOADED message"), _T("done")); #endif } } @@ -344,7 +344,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) #endif #ifdef _DEBUG - logMessage(L"Loading modules", L"done"); + logMessage(_T("Loading modules"), _T("done")); #endif return 0; @@ -380,7 +380,7 @@ extern "C" int __declspec(dllexport) Unload(void) if (hAdvaimg) FreeLibrary(hAdvaimg); #ifdef _DEBUG - logMessage(L"Unload", L"Job done"); + logMessage(_T("Unload"), _T("Job done")); #endif return 0; diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp index d88b6938ee..6d5cf7c553 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, L"splash\\splash.png"); + _tcscpy_s(inBuf, _T("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, L"sounds\\startup.wav"); + _tcscpy_s(inBuf, _T("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, L""); + _tcscpy_s(inBuf, _T("")); DBFreeVariant(&dbv); } else @@ -178,7 +178,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } else { - szMirDir = Utils_ReplaceVarsT(L"%miranda_path%"); + szMirDir = Utils_ReplaceVarsT(_T("%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), L"%s (*.png, *.bmp)%c*.png;*.bmp%c%c", TranslateT("Graphic files"), 0, 0, 0); + mir_sntprintf(tmp, SIZEOF(tmp), _T("%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 = L""; + ofn.lpstrDefExt = _T(""); if (GetOpenFileName(&ofn)) { lstrcpy(szSplashFile, szTempPath); #ifdef _DEBUG - logMessage(L"Set path", szSplashFile); + logMessage(_T("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(L"%miranda_path%"); + szMirDir = Utils_ReplaceVarsT(_T("%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), L"%s (*.wav, *.mp3)%c*.wav;*.mp3%c%c", TranslateT("Sound Files"), 0, 0, 0); + mir_sntprintf(tmp, SIZEOF(tmp), _T("%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 = L""; + ofn.lpstrDefExt = _T(""); if (GetOpenFileName(&ofn)) { lstrcpy(szSoundFile,szTempPath); #ifdef _DEBUG - logMessage(L"Set sound path", szSoundFile); + logMessage(_T("Set sound path"), szSoundFile); #endif // Make path relative diff --git a/plugins/SplashScreen/src/services.cpp b/plugins/SplashScreen/src/services.cpp index 1dfe6ee5fb..f38c8eeb8f 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), L"%s\\%s", szMirDir, filename); + mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), _T("%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 = L"PNG and BMP files\0*.png;*.bmp\0\0"; + ofn.lpstrFilter = _T("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 = L""; + ofn.lpstrDefExt = _T(""); if (GetOpenFileName(&ofn)) CallService(MS_SHOWSPLASH,(WPARAM)szTempPath,0); diff --git a/plugins/SplashScreen/src/splash.cpp b/plugins/SplashScreen/src/splash.cpp index aa7e4eba6e..196c4adedd 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(L"WM_LOADED", L"called"); + logMessage(_T("WM_LOADED"), _T("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), L"%d", wParam); - logMessage(L"Timer ID", b); - mir_sntprintf(b, SIZEOF(b), L"%d", options.showtime); - logMessage(L"ShowTime value", b); + 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); #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(L"Showtime timer"), L"triggered"); + logMessage(_T("Showtime timer"), _T("triggered")); #endif } } @@ -68,13 +68,13 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM if (wParam == 7) { #ifdef _DEBUG - logMessage(L"On Modules Loaded timer", L"triggered"); + logMessage(_T("On Modules Loaded timer"), _T("triggered")); #endif } if (wParam == 8) { #ifdef _DEBUG - logMessage(L"On Modules Loaded workaround", L"triggered"); + logMessage(_T("On Modules Loaded workaround"), _T("triggered")); #endif } } @@ -133,7 +133,7 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM { PostQuitMessage(0); #ifdef _DEBUG - logMessage(L"WM_DESTROY", L"called"); + logMessage(_T("WM_DESTROY"), _T("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), L"%s%s", szPrefix, mirandaVerString); + mir_sntprintf(verString, SIZEOF(verString), _T("%s%s"), szPrefix, mirandaVerString); mir_free(mirandaVerString); LOGFONT lf = {0}; lf.lfHeight = 14; - _tcscpy_s(lf.lfFaceName, L"Verdana"); + _tcscpy_s(lf.lfFaceName, _T("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(L"Timer TimeToShow", L"set"); + logMessage(_T("Timer TimeToShow"), _T("set")); #endif } } @@ -327,7 +327,7 @@ int SplashThread(void *arg) if (SetTimer(hwndSplash, 8, 2000, 0)) { #ifdef _DEBUG - logMessage(L"Timer Modules loaded", L"set"); + logMessage(_T("Timer Modules loaded"), _T("set")); #endif } } @@ -361,7 +361,7 @@ BOOL ShowSplash(BOOL bpreview) SplashBmp = new MyBitmap; #ifdef _DEBUG - logMessage(L"Loading splash file", szSplashFile); + logMessage(_T("Loading splash file"), szSplashFile); #endif SplashBmp->loadFromFile(szSplashFile, NULL); @@ -369,7 +369,7 @@ BOOL ShowSplash(BOOL bpreview) DWORD threadID; #ifdef _DEBUG - logMessage(L"Thread", L"start"); + logMessage(_T("Thread"), _T("start")); #endif if (bpreview) @@ -379,7 +379,7 @@ BOOL ShowSplash(BOOL bpreview) timeout = 2000; #ifdef _DEBUG - logMessage(L"Preview", L"yes"); + logMessage(_T("Preview"), _T("yes")); #endif } else @@ -387,15 +387,15 @@ BOOL ShowSplash(BOOL bpreview) timeout = options.showtime; #ifdef _DEBUG TCHAR b [40]; - mir_sntprintf(b, SIZEOF(b), L"%d", options.showtime); - logMessage(L"Timeout", b); + mir_sntprintf(b, SIZEOF(b), _T("%d"), options.showtime); + logMessage(_T("Timeout"), b); #endif } hSplashThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)SplashThread, (LPVOID)timeout, 0, &threadID); #ifdef _DEBUG - logMessage(L"Thread", L"end"); + logMessage(_T("Thread"), _T("end")); #endif CloseHandle(hSplashThread); -- cgit v1.2.3