From 8ae3679aa1339ce9abee53adb69902bd6b7513dc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 Jul 2016 10:31:04 +0000 Subject: hello, Unix. phase 1: removing _T() git-svn-id: http://svn.miranda-ng.org/main/trunk@17127 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CrashDumper/src/crshdmp.cpp | 10 +++++----- plugins/CrashDumper/src/dumper.cpp | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'plugins/CrashDumper') diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index 73aa9edb38..1d6692ca26 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -159,7 +159,7 @@ INT_PTR CopyLinkToClipboard(WPARAM, LPARAM) ptrT tmp(db_get_wsa(NULL, PluginName, "Username")); if (tmp != NULL) { TCHAR buffer[MAX_PATH]; - mir_sntprintf(buffer, _T("http://vi.miranda-ng.org/detail/%s"), tmp); + mir_sntprintf(buffer, L"http://vi.miranda-ng.org/detail/%s", tmp); int bufLen = (sizeof(buffer) + 1) * sizeof(TCHAR); HANDLE hData = GlobalAlloc(GMEM_MOVEABLE, bufLen); @@ -245,7 +245,7 @@ static int ModulesLoaded(WPARAM, LPARAM) crs_a2t(vertxt, temp); if (ServiceExists(MS_FOLDERS_REGISTER_PATH)) { - replaceStrT(profpath, _T("%miranda_userdata%")); + replaceStrT(profpath, L"%miranda_userdata%"); // Removed because it isn't available on Load() // hCrashLogFolder = FoldersRegisterCustomPathT(PluginName, LPGEN("Crash Reports"), CrashLogFolder); @@ -355,7 +355,7 @@ static int PreShutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void) { - hMsftedit = LoadLibrary(_T("Msftedit.dll")); + hMsftedit = LoadLibrary(L"Msftedit.dll"); if (hMsftedit == NULL) return 1; @@ -365,8 +365,8 @@ extern "C" int __declspec(dllexport) Load(void) mir_getLP(&pluginInfoEx); - profname = Utils_ReplaceVarsT(_T("%miranda_profilename%.dat")); - profpath = Utils_ReplaceVarsT(_T("%miranda_userdata%")); + profname = Utils_ReplaceVarsT(L"%miranda_profilename%.dat"); + profpath = Utils_ReplaceVarsT(L"%miranda_userdata%"); if (catchcrashes && !needrestart) mir_sntprintf(CrashLogFolder, TEXT("%s\\CrashLog"), profpath); _tcsncpy_s(VersionInfoFolder, profpath, _TRUNCATE); diff --git a/plugins/CrashDumper/src/dumper.cpp b/plugins/CrashDumper/src/dumper.cpp index 44b5a8b1f4..0ea80781bd 100644 --- a/plugins/CrashDumper/src/dumper.cpp +++ b/plugins/CrashDumper/src/dumper.cpp @@ -211,7 +211,7 @@ static void GetPluginsString(CMString& buffer, unsigned& flags) timebuf, "", TEXT("")); GetLinkedModulesInfo(path, ubuffer); - ubuffer.Append(_T("\r\n")); + ubuffer.Append(L"\r\n"); ++ucount; } @@ -234,7 +234,7 @@ static void GetPluginsString(CMString& buffer, unsigned& flags) VS_FIXEDFILEINFO* fi; void* pVerInfo = mir_alloc(verInfoSize); GetFileVersionInfo(path, 0, verInfoSize, pVerInfo); - VerQueryValue(pVerInfo, _T("\\"), (LPVOID*)&fi, &blockSize); + VerQueryValue(pVerInfo, L"\\", (LPVOID*)&fi, &blockSize); v1 = HIWORD(fi->dwProductVersionMS), v2 = LOWORD(fi->dwProductVersionMS), v3 = HIWORD(fi->dwProductVersionLS), v4 = LOWORD(fi->dwProductVersionLS); mir_free(pVerInfo); @@ -346,7 +346,7 @@ static void GetProtocolStrings(CMString& buffer) for (i = 0; i < protoCountMy; i++) buffer.AppendFormat(TEXT("%-24s %d - Enabled %d - Disabled %sLoaded\r\n"), (TCHAR*)_A2T(protoListMy[i]), protos[i].countse, - protos[i].countsd, protos[i].nloaded ? _T("Not ") : _T("")); + protos[i].countsd, protos[i].nloaded ? L"Not " : L""); } @@ -445,34 +445,34 @@ static void GetIconStrings(CMString& buffer) void PrintVersionInfo(CMString& buffer, unsigned flags) { GetProcessorString(buffer); - buffer.Append(_T("\r\n")); + buffer.Append(L"\r\n"); GetFreeMemoryString(buffer); - buffer.Append(_T("\r\n")); + buffer.Append(L"\r\n"); TCHAR tszOsVer[200]; GetOSDisplayString(tszOsVer, _countof(tszOsVer)); buffer.Append(tszOsVer); - buffer.Append(_T("\r\n")); + buffer.Append(L"\r\n"); GetInternetExplorerVersion(buffer); - buffer.Append(_T("\r\n")); + buffer.Append(L"\r\n"); GetAdminString(buffer); - buffer.Append(_T("\r\n")); + buffer.Append(L"\r\n"); GetLanguageString(buffer); - buffer.Append(_T("\r\n")); + buffer.Append(L"\r\n"); TCHAR *profpathfull = Utils_ReplaceVarsT(profpath); if (flags & VI_FLAG_PRNVAR) { GetFreeDiskString(profpathfull, buffer); - buffer.Append(_T("\r\n")); + buffer.Append(L"\r\n"); } buffer.AppendFormat(TEXT("\r\nMiranda NG Version: %s"), vertxt); GetWow64String(buffer); - buffer.Append(_T("\r\n")); + buffer.Append(L"\r\n"); TCHAR path[MAX_PATH], mirtime[30]; GetModuleFileName(NULL, path, MAX_PATH); @@ -503,7 +503,7 @@ void PrintVersionInfo(CMString& buffer, unsigned flags) mir_free(profpathfull); GetLanguagePackString(buffer); - buffer.Append(_T("\r\n")); + buffer.Append(L"\r\n"); // buffer.AppendFormat(TEXT("Nightly: %s\r\n"), _tcsstr(vertxt, TEXT("alpha")) ? TEXT("Yes") : TEXT("No")); // buffer.AppendFormat(TEXT("Unicode: %s\r\n"), _tcsstr(vertxt, TEXT("Unicode")) ? TEXT("Yes") : TEXT("No")); @@ -585,7 +585,7 @@ void CreateCrashReport(HANDLE hDumpFile, PEXCEPTION_POINTERS exc_ptr, const TCHA int crashpos = buffer.GetLength(); ReadableExceptionInfo(exc_ptr->ExceptionRecord, buffer); - buffer.Append(_T("\r\n")); + buffer.Append(L"\r\n"); const HANDLE hProcess = GetCurrentProcess(); @@ -668,7 +668,7 @@ void CreateCrashReport(HANDLE hDumpFile, PEXCEPTION_POINTERS exc_ptr, const TCHA buffer.AppendFormat(formatd, (void*)frame.AddrPC.Offset, moduleName, (void*)Module.BaseOfImage,lineFileName, Line.LineNumber, name); } SymCleanup(hProcess); - buffer.Append(_T("\r\n")); + buffer.Append(L"\r\n"); PrintVersionInfo(buffer, VI_FLAG_PRNDLL); -- cgit v1.2.3