summaryrefslogtreecommitdiff
path: root/HTTPServer/GuiElements.cpp
diff options
context:
space:
mode:
authormataes2007 <mataes2007@e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb>2012-01-14 19:18:42 +0000
committermataes2007 <mataes2007@e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb>2012-01-14 19:18:42 +0000
commit0aafc6c4b2e485f5ee9bb0bdf3e687525859cb03 (patch)
tree73230de5fcc8ba7a89a8185f49dfb74313e02558 /HTTPServer/GuiElements.cpp
parent03d88e9750c2d983318035dcd33da24875799b4c (diff)
HTTPServer (patch from FREAK_THEMIGHTY):
code cleanup header reorganisation MM_INTERFACE support new langpacks support rather technical changes git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@258 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb
Diffstat (limited to 'HTTPServer/GuiElements.cpp')
-rw-r--r--HTTPServer/GuiElements.cpp158
1 files changed, 53 insertions, 105 deletions
diff --git a/HTTPServer/GuiElements.cpp b/HTTPServer/GuiElements.cpp
index d05af16..3716be5 100644
--- a/HTTPServer/GuiElements.cpp
+++ b/HTTPServer/GuiElements.cpp
@@ -15,57 +15,15 @@
//along with this program; if not, write to the Free Software
//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#ifdef NDEBUG //release
-#include "AggressiveOptimize.h" //create small code
-#endif
-
#include "GuiElements.h"
-#include <windows.h>
-#include <stdio.h>
-#include <commctrl.h>
-
-#pragma warning( push, 3 )
-#include <string>
using namespace std;
-#include "Glob.h"
#include "m_HTTPServer.h"
#include "FileShareNode.h"
#include "resource.h"
#include "IndexCreation.h"
-#include "newpluginapi.h"
-#include "m_database.h"
-#include "m_clist.h"
-#include "m_skin.h"
-#include "m_langpack.h"
-#include "m_options.h"
-#include "m_system.h"
-#include "m_history.h"
-#include "m_userinfo.h"
-#include "m_netlib.h"
-#include "m_message.h"
-#include "m_popup.h"
-#include "m_clui.h"
-
-#pragma warning( pop )
-
-struct NETLIBHTTPREQUEST_V032 {
- int cbSize;
- int requestType; //a REQUEST_
- DWORD flags;
- char *szUrl;
- NETLIBHTTPHEADER *headers; //If this is a POST request and headers
- //doesn't contain a Content-Length it'll be added automatically
- int headersCount;
- char *pData; //data to be sent in POST request.
- int dataLength; //must be 0 for REQUEST_GET/REQUEST_CONNECT
- int resultCode;
- char *szResultDescr;
-};
-
-
#define MS_SHARE_NEW_FILE "HTTPServer/ShareNewFile"
#define MS_SHOW_STATISTICS_VIEW "HTTPServer/ShowStatisticsView"
@@ -111,7 +69,7 @@ string sPageKeyword = szDefaultPageKeyword;
void ReplaceAll(string &sSrc, const char * pszReplace, const string &sNew) {
string::size_type nCur = 0;
- int nRepalceLen = strlen(pszReplace);
+ size_t nRepalceLen = strlen(pszReplace);
while ((nCur = sSrc.find(pszReplace, nCur)) != sSrc.npos) {
sSrc.replace(nCur, nRepalceLen, sNew);
nCur += sNew.size();
@@ -205,10 +163,6 @@ unsigned long GetExternIP(const char *szURL, const char *szPattern) {
externIP.s_addr = 0;
nlreply = (NETLIBHTTPREQUEST *) CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM) hNetlibUser, (LPARAM) & nlhr);
- if (nlreply == 0) {
- nlhr.cbSize = sizeof(NETLIBHTTPREQUEST_V032); // try with old size
- nlreply = (NETLIBHTTPREQUEST *) CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM) hNetlibUser, (LPARAM) & nlhr);
- }
if (nlreply) {
if (nlreply->resultCode >= 200 && nlreply->resultCode < 300) {
nlreply->pData[nlreply->dataLength] = 0;// make sure its null terminated
@@ -253,7 +207,7 @@ unsigned long GetExternIP(const char *szURL, const char *szPattern) {
string sCreateLink(const char * pszSrvPath) {
char szTemp[30];
string sLink = DBGetString(NULL, MODULE, "ExternalSrvName", szDefaultExternalSrvName);
- _snprintf(szTemp, sizeof(szTemp), "%d.%d.%d.%d", SplitIpAddress(dwLocalIpAddress));
+ mir_snprintf(szTemp, sizeof(szTemp), "%d.%d.%d.%d", SplitIpAddress(dwLocalIpAddress));
ReplaceAll(sLink, "%LocalIP%", szTemp);
if (sLink.find("%ExternalIP%") != sLink.npos) {
@@ -266,11 +220,11 @@ string sCreateLink(const char * pszSrvPath) {
dwExternalIpAddressGenerated = GetTickCount();
}
- _snprintf(szTemp, sizeof(szTemp), "%d.%d.%d.%d", SplitIpAddress(dwExternalIpAddress));
+ mir_snprintf(szTemp, sizeof(szTemp), "%d.%d.%d.%d", SplitIpAddress(dwExternalIpAddress));
ReplaceAll(sLink, "%ExternalIP%", szTemp);
}
- _snprintf(szTemp, sizeof(szTemp), "%d", dwLocalPortUsed, szTemp);
+ mir_snprintf(szTemp, sizeof(szTemp), "%d", dwLocalPortUsed, szTemp);
ReplaceAll(sLink, "%Port%", szTemp);
string sSrvPath = pszSrvPath;
@@ -295,7 +249,7 @@ string sCreateLink(const char * pszSrvPath) {
// Developer : KN, Houdini
/////////////////////////////////////////////////////////////////////
-UINT CALLBACK ShareNewFileDialogHook(
+UINT_PTR CALLBACK ShareNewFileDialogHook(
HWND hDlg, // handle to child dialog box
UINT uiMsg, // message identifier
WPARAM wParam, // message parameter
@@ -305,11 +259,11 @@ UINT CALLBACK ShareNewFileDialogHook(
static int nInit = 0;
- STFileShareInfo * pstShare = (STFileShareInfo *)GetWindowLong(hDlg, GWL_USERDATA);
+ STFileShareInfo * pstShare = (STFileShareInfo *)GetWindowLong(hDlg, GWLP_USERDATA);
switch (uiMsg) {
case WM_INITDIALOG: {
pstShare = (STFileShareInfo *)((OPENFILENAME *)lParam)->lCustData;
- SetWindowLong(hDlg, GWL_USERDATA, (LPARAM)pstShare);
+ SetWindowLong(hDlg, GWLP_USERDATA, (LPARAM)pstShare);
SetDlgItemInt(hDlg, IDC_MAX_DOWNLOADS, pstShare->nMaxDownloads, true);
SendMessage(GetDlgItem(hDlg, IDC_ALLOWED_IPADDRESS), IPM_SETADDRESS, 0, pstShare->dwAllowedIP);
@@ -422,7 +376,7 @@ UINT CALLBACK ShareNewFileDialogHook(
//if( ! (pstShare->dwAllowedIP & pstShare->dwAllowedMask)
if (!bTranslated || (strlen(pstShare->pszSrvPath) <= 0)) {
- SetWindowLong(hDlg, DWL_MSGRESULT, 1);
+ SetWindowLong(hDlg, DWLP_MSGRESULT, 1);
return true;
}
return false;
@@ -485,7 +439,7 @@ UINT CALLBACK ShareNewFileDialogHook(
bool bShowShareNewFileDlg(HWND hwndOwner, STFileShareInfo * pstNewShare) {
OPENFILENAME ofn = {0};
ofn.lStructSize = sizeof(OPENFILENAME);
- ofn.lpstrFilter = "All Files (*.*)\0*.*\0";
+ ofn.lpstrFilter = _T("All Files (*.*)\0*.*\0");
ofn.lpstrFile = pstNewShare->pszRealPath;
ofn.nMaxFile = pstNewShare->dwMaxRealPath;
@@ -503,7 +457,7 @@ bool bShowShareNewFileDlg(HWND hwndOwner, STFileShareInfo * pstNewShare) {
| OFN_ALLOWMULTISELECT;
ofn.hwndOwner = hwndOwner;
ofn.hInstance = hInstance;
- ofn.lpstrTitle = Translate("Specify a file to share");
+ ofn.lpstrTitle = TranslateT("Specify a file to share");
ofn.lpTemplateName = MAKEINTRESOURCE(IDD_NEW_SHARE_PROPERTIES);
ofn.lpfnHook = ShareNewFileDialogHook;
ofn.lCustData = (LPARAM)pstNewShare;
@@ -511,8 +465,8 @@ bool bShowShareNewFileDlg(HWND hwndOwner, STFileShareInfo * pstNewShare) {
if (!GetOpenFileName(&ofn)) {
DWORD dwError = CommDlgExtendedError();
if (dwError) {
- char szTemp[200];
- _snprintf(szTemp, sizeof(szTemp), "Failed to create File Open dialog the error returned was %d", dwError);
+ TCHAR szTemp[200];
+ mir_sntprintf(szTemp, sizeof(szTemp), _T("Failed to create File Open dialog the error returned was %d"), dwError);
MessageBox(NULL, szTemp, MSG_BOX_TITEL, MB_OK);
}
return false;
@@ -547,7 +501,7 @@ bool bShowShareNewFileDlg(HWND hwndOwner, STFileShareInfo * pstNewShare) {
pstNewShare->pszRealPath[pstNewShare->dwMaxRealPath] = '\0';
if (CallService(MS_HTTP_ADD_CHANGE_REMOVE, 0, (LPARAM)pstNewShare)) {
- MessageBox(NULL, "Failed to share new file", MSG_BOX_TITEL, MB_OK);
+ MessageBox(NULL, _T("Failed to share new file"), MSG_BOX_TITEL, MB_OK);
return false;
}
pszFileNamePos++;
@@ -557,7 +511,7 @@ bool bShowShareNewFileDlg(HWND hwndOwner, STFileShareInfo * pstNewShare) {
} else {
if (CallService(MS_HTTP_ADD_CHANGE_REMOVE, 0, (LPARAM)pstNewShare)) {
- MessageBox(NULL, "Failed to share new file", MSG_BOX_TITEL, MB_OK);
+ MessageBox(NULL, _T("Failed to share new file"), MSG_BOX_TITEL, MB_OK);
return false;
}
}
@@ -609,7 +563,7 @@ void UpdateStatisticView(HWND hwndDlg, bool bRefressUsersOnly = false) {
ListView_InsertItem(hShareList, &sItem);
- _snprintf(szTmp, sizeof(szTmp), "%d", pclCur->st.nMaxDownloads);
+ mir_snprintf(szTmp, sizeof(szTmp), "%d", pclCur->st.nMaxDownloads);
sItem.iSubItem = 1;
sItem.pszText = szTmp;
ListView_SetItem(hShareList, &sItem);
@@ -649,7 +603,7 @@ void UpdateStatisticView(HWND hwndDlg, bool bRefressUsersOnly = false) {
ListView_SetItem(hUserList, &sItem);
if (pclCurUser->dwTotalSize) {
- _snprintf(szTmp, sizeof(szTmp), "%d %%", (pclCurUser->dwCurrentDL * 100) / pclCurUser->dwTotalSize);
+ mir_snprintf(szTmp, sizeof(szTmp), "%d %%", (pclCurUser->dwCurrentDL * 100) / pclCurUser->dwTotalSize);
} else {
strcpy(szTmp, "? %%");
}
@@ -661,9 +615,9 @@ void UpdateStatisticView(HWND hwndDlg, bool bRefressUsersOnly = false) {
if (dwSpeed > 10000) {
dwSpeed += 512; // make sure we round ot down correctly.
dwSpeed /= 1024;
- _snprintf(szTmp, sizeof(szTmp), "%d KB/Sec", dwSpeed);
+ mir_snprintf(szTmp, sizeof(szTmp), "%d KB/Sec", dwSpeed);
} else {
- _snprintf(szTmp, sizeof(szTmp), "%d B/Sec", dwSpeed);
+ mir_snprintf(szTmp, sizeof(szTmp), "%d B/Sec", dwSpeed);
}
sItem.iSubItem = 4;
sItem.pszText = szTmp;
@@ -733,7 +687,7 @@ void SetWindowsCtrls(HWND hwndDlg) {
// Developer : KN, Houdini
/////////////////////////////////////////////////////////////////////
-static BOOL CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
+static INT_PTR CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
switch (msg) {
case WM_INITDIALOG: {
SendMessage(hwndDlg, WM_SETICON, ICON_BIG,
@@ -758,36 +712,36 @@ static BOOL CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wParam,
LVCOLUMN cCol = { 0 };
cCol.mask = LVCF_TEXT | LVCF_WIDTH;
cCol.cx = DBGetContactSettingWord(NULL, MODULE, "StatWnd_cx1", 126);
- cCol.pszText = Translate("Share name");
+ cCol.pszText = TranslateT("Share name");
ListView_InsertColumn(hShareList, 0, &cCol);
cCol.cx = DBGetContactSettingWord(NULL, MODULE, "StatWnd_cx2", 48);
- cCol.pszText = Translate("Max Downloads");
+ cCol.pszText = TranslateT("Max Downloads");
ListView_InsertColumn(hShareList, 1, &cCol);
cCol.cx = DBGetContactSettingWord(NULL, MODULE, "StatWnd_cx3", 96);
- cCol.pszText = Translate("Allowed IP");
+ cCol.pszText = TranslateT("Allowed IP");
ListView_InsertColumn(hShareList, 2, &cCol);
cCol.cx = DBGetContactSettingWord(NULL, MODULE, "StatWnd_cx4", 104);
- cCol.pszText = Translate("Allowed Mask");
+ cCol.pszText = TranslateT("Allowed Mask");
ListView_InsertColumn(hShareList, 3, &cCol);
cCol.cx = DBGetContactSettingWord(NULL, MODULE, "StatWnd_cx5", 252);
- cCol.pszText = Translate("Real path");
+ cCol.pszText = TranslateT("Real path");
ListView_InsertColumn(hShareList, 4, &cCol);
cCol.mask = LVCF_TEXT | LVCF_WIDTH;
cCol.cx = DBGetContactSettingWord(NULL, MODULE, "StatWnd_cx6", 142);
- cCol.pszText = Translate("Share name");
+ cCol.pszText = TranslateT("Share name");
ListView_InsertColumn(hUserList, 0, &cCol);
cCol.cx = DBGetContactSettingWord(NULL, MODULE, "StatWnd_cx7", 111);
- cCol.pszText = Translate("User");
+ cCol.pszText = TranslateT("User");
ListView_InsertColumn(hUserList, 1, &cCol);
cCol.cx = DBGetContactSettingWord(NULL, MODULE, "StatWnd_cx8", 100);
- cCol.pszText = Translate("Agent");
+ cCol.pszText = TranslateT("Agent");
ListView_InsertColumn(hUserList, 2, &cCol);
cCol.cx = DBGetContactSettingWord(NULL, MODULE, "StatWnd_cx9", 100);
- cCol.pszText = Translate("Completed");
+ cCol.pszText = TranslateT("Completed");
ListView_InsertColumn(hUserList, 3, &cCol);
cCol.cx = DBGetContactSettingWord(NULL, MODULE, "StatWnd_cx10", 100);
- cCol.pszText = Translate("Speed");
+ cCol.pszText = TranslateT("Speed");
ListView_InsertColumn(hUserList, 4, &cCol);
bool b = DBGetContactSettingByte(NULL, MODULE, "StatWnd_ShowHidden", 0) != 0;
@@ -844,7 +798,7 @@ static BOOL CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wParam,
strncpy(&szServPath[1], fileName+1, MAX_PATH-2);
if (CallService(MS_HTTP_ADD_CHANGE_REMOVE, 0, (LPARAM)&stNewShare)) {
- MessageBox(NULL, "Failed to share new file", MSG_BOX_TITEL, MB_OK);
+ MessageBox(NULL, _T("Failed to share new file"), MSG_BOX_TITEL, MB_OK);
return false;
}
}
@@ -952,18 +906,18 @@ static BOOL CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wParam,
if (ListView_GetItem(hShareList, &sItem)) {
string sLink = sCreateLink(sItem.pszText);
if (sLink.size() <= 0) {
- MessageBox(hwndDlg, "Selected link size is 0", MSG_BOX_TITEL, MB_OK);
+ MessageBox(hwndDlg, _T("Selected link size is 0"), MSG_BOX_TITEL, MB_OK);
return TRUE;
}
if (LOWORD(wParam) == ID_SHARELIST_COPYLINK) {
if (!OpenClipboard(hwndDlg)) {
- MessageBox(hwndDlg, "Failed to get access to clipboard", MSG_BOX_TITEL, MB_OK);
+ MessageBox(hwndDlg, _T("Failed to get access to clipboard"), MSG_BOX_TITEL, MB_OK);
return TRUE;
}
if (!EmptyClipboard()) {
- MessageBox(hwndDlg, "Failed to get close the clipboard", MSG_BOX_TITEL, MB_OK);
+ MessageBox(hwndDlg, _T("Failed to get close the clipboard"), MSG_BOX_TITEL, MB_OK);
return TRUE;
}
@@ -977,14 +931,14 @@ static BOOL CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wParam,
HANDLE hMyData = SetClipboardData(CF_TEXT, hglbCopy);
if (! hMyData)
- MessageBox(hwndDlg, "Failed to set clipboard data", MSG_BOX_TITEL, MB_OK);
+ MessageBox(hwndDlg, _T("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, _T("ListView_GetItem failed"), MSG_BOX_TITEL, MB_OK);
}
} else {
MessageBox(hwndDlg, Translate("No share selected"), MSG_BOX_TITEL, MB_OK);
@@ -1044,13 +998,7 @@ static BOOL CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wParam,
void SendLinkToUser(WPARAM wParam, char *pszSrvPath) {
string sLink = sCreateLink(pszSrvPath);
-
- //NB: Current versions of the convers plugin use the name
- //"SRMsg/LaunchMessageWindow" instead. For compatibility you should call
- //both names and the correct one will work.
-
- CallService(MS_MSG_SENDMESSAGE, (WPARAM)wParam, (LPARAM)sLink.c_str());
- CallService("SRMsg/LaunchMessageWindow", (WPARAM)wParam, (LPARAM)sLink.c_str());
+ CallService(MS_MSG_SENDMESSAGE, wParam, (LPARAM)sLink.c_str());
}
/////////////////////////////////////////////////////////////////////
@@ -1068,7 +1016,7 @@ void SendLinkToUser(WPARAM wParam, char *pszSrvPath) {
// Developer : KN, Houdini
/////////////////////////////////////////////////////////////////////
-static long nShareNewFile(WPARAM wParam, LPARAM lParam) {
+static INT_PTR nShareNewFile(WPARAM wParam, LPARAM lParam) {
HANDLE hContact = (HANDLE)wParam;
// used to be _MAX_PATH
@@ -1125,7 +1073,7 @@ static long nShareNewFile(WPARAM wParam, LPARAM lParam) {
}
-static long nShowStatisticsView(WPARAM /*wParam*/, LPARAM /*lParam*/) {
+static INT_PTR nShowStatisticsView(WPARAM /*wParam*/, LPARAM /*lParam*/) {
if (hwndStatsticView) {
BringWindowToTop(hwndStatsticView);
return 0;
@@ -1152,7 +1100,7 @@ static long nShowStatisticsView(WPARAM /*wParam*/, LPARAM /*lParam*/) {
// Developer : KN, Houdini
/////////////////////////////////////////////////////////////////////
-static BOOL CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
+static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
switch (msg) {
case WM_INITDIALOG: {
string sDefExt = DBGetString(NULL, MODULE, "ExternalSrvName", szDefaultExternalSrvName);
@@ -1275,7 +1223,7 @@ static BOOL CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
GetDlgItemText(hwndDlg, IDC_PAGE_KEYWORD, szKeyWord, sizeof(szKeyWord));
DWORD dwExternalIP = GetExternIP(szUrl, szKeyWord);
- _snprintf(szKeyWord, sizeof(szKeyWord), Translate("You external ip was detected as %d.%d.%d.%d\r\nby: %s") ,
+ mir_snprintf(szKeyWord, sizeof(szKeyWord), Translate("You external ip was detected as %d.%d.%d.%d\r\nby: %s") ,
SplitIpAddress(dwExternalIP) ,
szUrl);
MessageBox(hwndDlg, szKeyWord, MSG_BOX_TITEL, MB_OK);
@@ -1295,14 +1243,14 @@ static BOOL CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
bool bNew = IsDlgButtonChecked(hwndDlg, IDC_ADD_STATISTICS_MENU_ITEM) == BST_CHECKED;
if (b != bNew) {
DBWriteContactSettingByte(NULL, MODULE, "AddStatisticsMenuItem", bNew);
- MessageBox(hwndDlg, Translate("You need to restart miranda to change the main menu"), MSG_BOX_TITEL, MB_OK);
+ MessageBox(hwndDlg, TranslateT("You need to restart miranda to change the main menu"), MSG_BOX_TITEL, MB_OK);
}
b = DBGetContactSettingByte(NULL, MODULE, "AddAcceptConMenuItem", 1) != 0;
bNew = IsDlgButtonChecked(hwndDlg, IDC_ACCEPT_COM_MENU_ITEM) == BST_CHECKED;
if (b != bNew) {
DBWriteContactSettingByte(NULL, MODULE, "AddAcceptConMenuItem", bNew);
- MessageBox(hwndDlg, Translate("You need to restart miranda to change the main menu"), MSG_BOX_TITEL, MB_OK);
+ MessageBox(hwndDlg, TranslateT("You need to restart miranda to change the main menu"), MSG_BOX_TITEL, MB_OK);
}
bNew = IsDlgButtonChecked(hwndDlg, IDC_WRITE_LOG_FILE) == BST_CHECKED;
@@ -1404,9 +1352,9 @@ int OptionsInitialize(WPARAM wParam, LPARAM /*lParam*/) {
odp.position = 900000000;
odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCE(IDD_OPT_HTTP_SERVER);
- odp.flags = ODPF_BOLDGROUPS;
- odp.pszTitle = Translate("HTTP Server");
- odp.pszGroup = Translate("Network");
+ odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;
+ odp.ptszTitle = LPGENT("HTTP Server");
+ odp.ptszGroup = LPGENT("Network");
odp.pfnDlgProc = OptionsDlgProc;
CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp);
return 0;
@@ -1543,39 +1491,39 @@ void InitGuiElements() {
hShareNewFileService = CreateServiceFunction(MS_SHARE_NEW_FILE, nShareNewFile);
if (! hShareNewFileService) {
- MessageBox(NULL, "Failed to CreateServiceFunction MS_SHARE_NEW_FILE", MSG_BOX_TITEL, MB_OK);
+ MessageBox(NULL, _T("Failed to CreateServiceFunction MS_SHARE_NEW_FILE"), MSG_BOX_TITEL, MB_OK);
return;
}
hShowStatisticsViewService = CreateServiceFunction(MS_SHOW_STATISTICS_VIEW, nShowStatisticsView);
if (! hShowStatisticsViewService) {
- MessageBox(NULL, "Failed to CreateServiceFunction MS_SHOW_STATISTICS_VIEW", MSG_BOX_TITEL, MB_OK);
+ MessageBox(NULL, _T("Failed to CreateServiceFunction MS_SHOW_STATISTICS_VIEW"), MSG_BOX_TITEL, MB_OK);
return;
}
CLISTMENUITEM mi;
ZeroMemory(&mi, sizeof(mi));
mi.cbSize = sizeof(mi);
- mi.flags = 0;
+ mi.flags = CMIF_TCHAR;
mi.pszContactOwner = NULL; //all contacts
mi.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SHARE_NEW_FILE));
mi.position = -2000019955;
- mi.pszName = Translate("HTTP Share new file");
+ mi.ptszName = LPGENT("HTTP Share new file");
mi.pszService = MS_SHARE_NEW_FILE;
hShareNewFileMenuItem = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM) & mi);
if (!hShareNewFileMenuItem) {
- MessageBox(NULL, "Failed to add contact menu item", MSG_BOX_TITEL, MB_OK);
+ MessageBox(NULL, _T("Failed to add contact menu item"), MSG_BOX_TITEL, MB_OK);
return;
}
if (DBGetContactSettingByte(NULL, MODULE, "AddStatisticsMenuItem", 1) != 0) {
mi.position = 1000085005;
- mi.flags = 0;
+ mi.flags = CMIF_TCHAR;
//mi.hIcon=LoadIcon(hInstance,MAKEINTRESOURCE(IDI_SHARE_NEW_FILE));
mi.pszContactOwner = NULL;
- mi.pszName = Translate("Show HTTP server statistics");
+ mi.ptszName = LPGENT("Show HTTP server statistics");
mi.pszService = MS_SHOW_STATISTICS_VIEW;
hShowStatisticsViewMenuItem = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM) & mi);
}
@@ -1583,7 +1531,7 @@ void InitGuiElements() {
hEventOptionsInitialize = HookEvent(ME_OPT_INITIALISE, OptionsInitialize);
if (!hEventOptionsInitialize)
- MessageBox(NULL, "Failed to HookEvent ME_OPT_INITIALISE", MSG_BOX_TITEL, MB_OK);
+ MessageBox(NULL, _T("Failed to HookEvent ME_OPT_INITIALISE"), MSG_BOX_TITEL, MB_OK);
bShowPopups = DBGetContactSettingByte(NULL, MODULE, "ShowPopups", bShowPopups) != 0;
/*