From 56981f0e01790a6d09a1490b9a2127a123f47383 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sun, 20 Jan 2013 20:28:16 +0000 Subject: - Another portion of _T replacement (patch from person) git-svn-id: http://svn.miranda-ng.org/main/trunk@3207 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HTTPServer/src/Glob.h | 2 +- plugins/HTTPServer/src/GuiElements.cpp | 24 ++++++++++++------------ plugins/HTTPServer/src/main.cpp | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/plugins/HTTPServer/src/Glob.h b/plugins/HTTPServer/src/Glob.h index dbce7e44e2..3eabbbb190 100644 --- a/plugins/HTTPServer/src/Glob.h +++ b/plugins/HTTPServer/src/Glob.h @@ -58,7 +58,7 @@ using namespace std; #define SD_BOTH 0x02 #define MODULE "HTTPServer" -#define MSG_BOX_TITEL _T("Miranda (HTTPServer.dll)") +#define MSG_BOX_TITEL TranslateT("Miranda (HTTPServer.dll)") #define SplitIpAddress( p ) (BYTE)(p>>24),(BYTE)(p>>16),(BYTE)(p>>8),(BYTE)(p) diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index e4c922fd6d..cd303b04a9 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -495,7 +495,7 @@ bool bShowShareNewFileDlg(HWND hwndOwner, STFileShareInfo * pstNewShare) { pstNewShare->pszRealPath[pstNewShare->dwMaxRealPath] = '\0'; if (CallService(MS_HTTP_ADD_CHANGE_REMOVE, 0, (LPARAM)pstNewShare)) { - MessageBox(NULL, _T("Failed to share new file"), MSG_BOX_TITEL, MB_OK); + MessageBox(NULL, TranslateT("Failed to share new file"), MSG_BOX_TITEL, MB_OK); return false; } pszFileNamePos++; @@ -505,7 +505,7 @@ bool bShowShareNewFileDlg(HWND hwndOwner, STFileShareInfo * pstNewShare) { } else { if (CallService(MS_HTTP_ADD_CHANGE_REMOVE, 0, (LPARAM)pstNewShare)) { - MessageBox(NULL, _T("Failed to share new file"), MSG_BOX_TITEL, MB_OK); + MessageBox(NULL, TranslateT("Failed to share new file"), MSG_BOX_TITEL, MB_OK); return false; } } @@ -792,7 +792,7 @@ static INT_PTR CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wPara strncpy(&szServPath[1], fileName+1, MAX_PATH-2); if (CallService(MS_HTTP_ADD_CHANGE_REMOVE, 0, (LPARAM)&stNewShare)) { - MessageBox(NULL, _T("Failed to share new file"), MSG_BOX_TITEL, MB_OK); + MessageBox(NULL, TranslateT("Failed to share new file"), MSG_BOX_TITEL, MB_OK); return false; } } @@ -900,18 +900,18 @@ static INT_PTR CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wPara if (ListView_GetItem(hShareList, &sItem)) { string sLink = sCreateLink(sItem.pszText); if (sLink.size() <= 0) { - MessageBox(hwndDlg, _T("Selected link size is 0"), MSG_BOX_TITEL, MB_OK); + MessageBox(hwndDlg, TranslateT("Selected link size is 0"), MSG_BOX_TITEL, MB_OK); return TRUE; } if (LOWORD(wParam) == ID_SHARELIST_COPYLINK) { if (!OpenClipboard(hwndDlg)) { - MessageBox(hwndDlg, _T("Failed to get access to clipboard"), MSG_BOX_TITEL, MB_OK); + MessageBox(hwndDlg, TranslateT("Failed to get access to clipboard"), MSG_BOX_TITEL, MB_OK); return TRUE; } if (!EmptyClipboard()) { - MessageBox(hwndDlg, _T("Failed to get close the clipboard"), MSG_BOX_TITEL, MB_OK); + MessageBox(hwndDlg, TranslateT("Failed to get close the clipboard"), MSG_BOX_TITEL, MB_OK); return TRUE; } @@ -925,17 +925,17 @@ static INT_PTR CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wPara HANDLE hMyData = SetClipboardData(CF_TEXT, hglbCopy); if (! hMyData) - MessageBox(hwndDlg, _T("Failed to set clipboard data"), MSG_BOX_TITEL, MB_OK); + MessageBox(hwndDlg, TranslateT("Failed to set clipboard data"), MSG_BOX_TITEL, MB_OK); CloseClipboard(); } else { CallService(MS_UTILS_OPENURL, 0, (LPARAM)(const char*)sLink.c_str()); } } else { - MessageBox(hwndDlg, "ListView_GetItem failed", MSG_BOX_TITEL, MB_OK); + MessageBox(hwndDlg, TranslateT("ListView_GetItem failed"), MSG_BOX_TITEL, MB_OK); } } else { - MessageBox(hwndDlg, Translate("No share selected"), MSG_BOX_TITEL, MB_OK); + MessageBox(hwndDlg, TranslateT("No share selected"), MSG_BOX_TITEL, MB_OK); } return TRUE; } @@ -1485,13 +1485,13 @@ void InitGuiElements() { hShareNewFileService = CreateServiceFunction(MS_SHARE_NEW_FILE, nShareNewFile); if (! hShareNewFileService) { - MessageBox(NULL, _T("Failed to CreateServiceFunction MS_SHARE_NEW_FILE"), MSG_BOX_TITEL, MB_OK); + MessageBox(NULL, TranslateT("Failed to CreateServiceFunction MS_SHARE_NEW_FILE"), MSG_BOX_TITEL, MB_OK); return; } hShowStatisticsViewService = CreateServiceFunction(MS_SHOW_STATISTICS_VIEW, nShowStatisticsView); if (! hShowStatisticsViewService) { - MessageBox(NULL, _T("Failed to CreateServiceFunction MS_SHOW_STATISTICS_VIEW"), MSG_BOX_TITEL, MB_OK); + MessageBox(NULL, TranslateT("Failed to CreateServiceFunction MS_SHOW_STATISTICS_VIEW"), MSG_BOX_TITEL, MB_OK); return; } @@ -1507,7 +1507,7 @@ void InitGuiElements() { hShareNewFileMenuItem = Menu_AddMainMenuItem(&mi); if (!hShareNewFileMenuItem) { - MessageBox(NULL, _T("Failed to add contact menu item"), MSG_BOX_TITEL, MB_OK); + MessageBox(NULL, TranslateT("Failed to add contact menu item"), MSG_BOX_TITEL, MB_OK); return; } diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp index 44ff4279c8..3c45bdfaab 100644 --- a/plugins/HTTPServer/src/main.cpp +++ b/plugins/HTTPServer/src/main.cpp @@ -154,11 +154,11 @@ bool bWriteToFile(HANDLE hFile, const char * pszSrc, int nLen = -1) { void LogEvent(const char * pszTitle, const char * pszLog) { HANDLE hFile = CreateFile(sLogFilePath.c_str(), GENERIC_WRITE, FILE_SHARE_READ, 0, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - MessageBox(NULL, _T("Failed to open or create log file"), MSG_BOX_TITEL, MB_OK); + MessageBox(NULL, TranslateT("Failed to open or create log file"), MSG_BOX_TITEL, MB_OK); return; } if (SetFilePointer(hFile, 0, 0, FILE_END) == INVALID_SET_FILE_POINTER) { - MessageBox(NULL, _T("Failed to move to the end of the log file"), MSG_BOX_TITEL, MB_OK); + MessageBox(NULL, TranslateT("Failed to move to the end of the log file"), MSG_BOX_TITEL, MB_OK); CloseHandle(hFile); return; } @@ -177,7 +177,7 @@ void LogEvent(const char * pszTitle, const char * pszLog) { !bWriteToFile(hFile, " : ") || !bWriteToFile(hFile, pszLog, nLogLen) || !bWriteToFile(hFile, "\r\n")) { - MessageBox(NULL, _T("Failed to write some part of the log file"), MSG_BOX_TITEL, MB_OK); + MessageBox(NULL, TranslateT("Failed to write some part of the log file"), MSG_BOX_TITEL, MB_OK); } CloseHandle(hFile); } @@ -644,7 +644,7 @@ INT_PTR nToggelAcceptConnections(WPARAM wparam, LPARAM /*lparam*/) { hDirectBoundPort = (HANDLE) CallService(MS_NETLIB_BINDPORT, (WPARAM) hNetlibUser, (LPARAM) & nlb); if (!hDirectBoundPort) { char szTemp[200]; - _snprintf(szTemp, sizeof(szTemp), _T("Failed to bind to port %s\r\nThis is most likely because another program or service is using this port") , + _snprintf(szTemp, sizeof(szTemp), TranslateT("Failed to bind to port %s\r\nThis is most likely because another program or service is using this port") , nlb.wPort == 80 ? "80" : nus.szIncomingPorts); MessageBox(NULL, szTemp, MSG_BOX_TITEL, MB_OK); return 1001; -- cgit v1.2.3