From 423be683866fd8e305457eb725d8cdbe1f297fbd Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Feb 2019 12:43:20 +0300 Subject: popup code cleaning (cause we have no tchar.h) --- plugins/WhoUsesMyFiles/src/options.cpp | 4 ++-- plugins/WhoUsesMyFiles/src/wumfplug.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/WhoUsesMyFiles') diff --git a/plugins/WhoUsesMyFiles/src/options.cpp b/plugins/WhoUsesMyFiles/src/options.cpp index f481edf829..50414b1e37 100644 --- a/plugins/WhoUsesMyFiles/src/options.cpp +++ b/plugins/WhoUsesMyFiles/src/options.cpp @@ -19,7 +19,7 @@ along with this program. If not, see . void ShowThePreview() { - if (!ServiceExists(MS_POPUP_ADDPOPUPT)) { + if (!ServiceExists(MS_POPUP_ADDPOPUPW)) { MessageBox(nullptr, TranslateT("Popup plugin not found!"), TranslateT("Error"), MB_OK | MB_ICONSTOP); return; } @@ -108,7 +108,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara SendDlgItemMessage(hwndDlg,IDC_COLOR_BACK,CPM_SETCOLOUR,0,WumfOptions.ColorBack); SendDlgItemMessage(hwndDlg,IDC_COLOR_TEXT,CPM_SETCOLOUR,0,WumfOptions.ColorText); } - if ( !ServiceExists(MS_POPUP_ADDPOPUPT)) { + if ( !ServiceExists(MS_POPUP_ADDPOPUPW)) { DisableDelayOptions(hwndDlg); break; } diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp index 26ff252798..e393337547 100644 --- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp +++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp @@ -55,7 +55,7 @@ void LoadOptions() WumfOptions.DelayInf = g_plugin.getByte(DELAY_INF, FALSE); WumfOptions.DelaySet = g_plugin.getByte(DELAY_SET, FALSE); WumfOptions.DelaySec = g_plugin.getByte(DELAY_SEC, 0); - if (!ServiceExists(MS_POPUP_ADDPOPUPT)) { + if (!ServiceExists(MS_POPUP_ADDPOPUPW)) { WumfOptions.DelayDef = TRUE; WumfOptions.DelaySet = FALSE; WumfOptions.DelayInf = FALSE; @@ -134,7 +134,7 @@ void ShowWumfPopup(PWumf w) void ShowThePopup(PWumf w, LPTSTR title, LPTSTR text) { - POPUPDATAT ppd = { 0 }; + POPUPDATAW ppd = { 0 }; ppd.lchContact = NULL; ppd.lchIcon = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_DRIVE)); @@ -145,8 +145,8 @@ void ShowThePopup(PWumf w, LPTSTR title, LPTSTR text) else if (WumfOptions.DelaySet) ppd.iSeconds = WumfOptions.DelaySec; - mir_wstrncpy(ppd.lptzContactName, title, MAX_CONTACTNAME); - mir_wstrncpy(ppd.lptzText, text, MAX_SECONDLINE); + mir_wstrncpy(ppd.lpwzContactName, title, MAX_CONTACTNAME); + mir_wstrncpy(ppd.lpwzText, text, MAX_SECONDLINE); if (WumfOptions.UseWinColor) { ppd.colorBack = GetSysColor(COLOR_WINDOW); ppd.colorText = GetSysColor(COLOR_WINDOWTEXT); @@ -158,7 +158,7 @@ void ShowThePopup(PWumf w, LPTSTR title, LPTSTR text) ppd.PluginWindowProc = PopupDlgProc; ppd.PluginData = w; - PUAddPopupT(&ppd); + PUAddPopupW(&ppd); } void ThreadProc(LPVOID) -- cgit v1.2.3