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/Popup/src/config.cpp | 10 +++++----- plugins/Popup/src/history.cpp | 6 +++--- plugins/Popup/src/opt_class.cpp | 2 +- plugins/Popup/src/opt_skins.cpp | 2 +- plugins/Popup/src/popup_wnd2.cpp | 8 ++++---- plugins/Popup/src/services.cpp | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'plugins/Popup/src') diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp index 5a023520ab..ecc5a02e78 100644 --- a/plugins/Popup/src/config.cpp +++ b/plugins/Popup/src/config.cpp @@ -78,7 +78,7 @@ void PopupPreview() ppd.flags = PU2_UNICODE; ppd.lptzTitle = lptzTitle1Eng; - ppd.lptzText = lptzText1Eng; + ppd.lpwzText = lptzText1Eng; ppd.lchIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE); CallService(MS_POPUP_ADDPOPUP2, (WPARAM)&ppd, APF_NO_HISTORY); if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME * 2) / 3); // Pause @@ -87,20 +87,20 @@ void PopupPreview() ppd.cbSize = sizeof(ppd); ppd.flags = PU2_UNICODE; ppd.lptzTitle = lptzTitle2; - ppd.lptzText = lptzText2; + ppd.lpwzText = lptzText2; ppd.lchIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA); ppd.hbmAvatar = hbmNoAvatar; CallService(MS_POPUP_ADDPOPUP2, (WPARAM)&ppd, APF_NO_HISTORY); if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME * 2) / 3); // Pause - PUShowMessageT(TranslateT("This is a notification message"), (DWORD)SM_NOTIFY | 0x80000000); + PUShowMessageW(TranslateT("This is a notification message"), (DWORD)SM_NOTIFY | 0x80000000); if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME * 2) / 3); // Pause - PUShowMessageT(TranslateT("This is a warning message"), (DWORD)SM_WARNING | 0x80000000); + PUShowMessageW(TranslateT("This is a warning message"), (DWORD)SM_WARNING | 0x80000000); if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME * 2) / 3); // Pause - PUShowMessageT(TranslateT("This is an error message"), (DWORD)SM_ERROR | 0x80000000); + PUShowMessageW(TranslateT("This is an error message"), (DWORD)SM_ERROR | 0x80000000); } ////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Popup/src/history.cpp b/plugins/Popup/src/history.cpp index deed963c17..d0e745da64 100644 --- a/plugins/Popup/src/history.cpp +++ b/plugins/Popup/src/history.cpp @@ -75,7 +75,7 @@ void PopupHistoryAdd(POPUPDATA2 *ppdNew) *ppd = *ppdNew; if (ppd->flags & PU2_UNICODE) { ppd->lptzTitle = mir_wstrdup(ppd->lpwzTitle); - ppd->lptzText = mir_wstrdup(ppd->lptzText); + ppd->lpwzText = mir_wstrdup(ppd->lpwzText); } else { ppd->lpzTitle = mir_strdup(ppd->lpzTitle); @@ -188,7 +188,7 @@ static INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM, LPARAM lPara if (ppd->flags & PU2_UNICODE) { ieData.dwFlags |= IEEDF_UNICODE_TEXT | IEEDF_UNICODE_NICK; ieData.pszNickW = ppd->lptzTitle; - ieData.pszTextW = ppd->lptzText; + ieData.pszTextW = ppd->lpwzText; ieData.pszText2W = nullptr; } else { @@ -372,7 +372,7 @@ static INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM, LPARAM lPara if (ppd->flags & PU2_UNICODE) { ieData.dwFlags |= IEEDF_UNICODE_TEXT | IEEDF_UNICODE_NICK; ieData.pszNickW = ppd->lptzTitle; - ieData.pszTextW = ppd->lptzText; + ieData.pszTextW = ppd->lpwzText; ieData.pszText2W = nullptr; } else { diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp index 0d9bd89dec..b3fbfe469a 100644 --- a/plugins/Popup/src/opt_class.cpp +++ b/plugins/Popup/src/opt_class.cpp @@ -342,7 +342,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l ppd.cbSize = sizeof(ppd); ppd.flags = PU2_UNICODE; ppd.lptzTitle = ptd->pszDescription; - ppd.lptzText = TranslateT("Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn!"); + ppd.lpwzText = TranslateT("Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn!"); ppd.iSeconds = ptd->timeoutValue; ppd.colorBack = ptd->colorBack; ppd.colorText = ptd->colorText; diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp index ba678c497e..7dc2ac93f7 100644 --- a/plugins/Popup/src/opt_skins.cpp +++ b/plugins/Popup/src/opt_skins.cpp @@ -77,7 +77,7 @@ static void updatePreviewImage(HWND hwndBox) ppd.flags = PU2_UNICODE; ppd.lchIcon = Skin_LoadIcon(SKINICON_STATUS_ONLINE); ppd.lptzTitle = TranslateT("Skin preview"); - ppd.lptzText = TranslateT("Just take a look at this skin... ;)"); + ppd.lpwzText = TranslateT("Just take a look at this skin... ;)"); POPUPOPTIONS customOptions = PopupOptions; customOptions.DynamicResize = FALSE; diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index 0f56959886..0b41e89e3c 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -688,8 +688,8 @@ void PopupWnd2::updateData(POPUPDATAW_V2 *ppd) if (m_textType == TT_NONE) m_textType = TT_UNICODE; - replaceStrW(m_lptzTitle, ppd->lptzContactName); - replaceStrW(m_lptzText, ppd->lptzText); + replaceStrW(m_lptzTitle, ppd->lpwzContactName); + replaceStrW(m_lptzText, ppd->lpwzText); setIcon(ppd->lchIcon); m_hNotification = ppd->hNotification; @@ -718,7 +718,7 @@ void PopupWnd2::updateData(POPUPDATA2 *ppd) if (m_textType == TT_NONE) m_textType = TT_UNICODE; replaceStrW(m_lptzTitle, ppd->lptzTitle); - replaceStrW(m_lptzText, ppd->lptzText); + replaceStrW(m_lptzText, ppd->lpwzText); } else { replaceStrW(m_lptzTitle, nullptr); @@ -991,7 +991,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara case UM_POPUPMODIFYACTIONICON: { - LPPOPUPACTIONID actionId = (LPPOPUPACTIONID)wParam; + POPUPACTIONID *actionId = (POPUPACTIONID*)wParam; for (int i = 0; i < m_actionCount; ++i) if ((m_actions[i].actionA.wParam == actionId->wParam) && (m_actions[i].actionA.lParam == actionId->lParam)) { diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp index 058b565150..d14f0aa622 100644 --- a/plugins/Popup/src/services.cpp +++ b/plugins/Popup/src/services.cpp @@ -237,7 +237,7 @@ INT_PTR Popup_ShowMessageW(WPARAM wParam, LPARAM lParam) POPUPDATA2 ppd2 = { 0 }; ppd2.cbSize = sizeof(ppd2); ppd2.flags = PU2_UNICODE; - ppd2.lptzText = (wchar_t*)wParam; + ppd2.lpwzText = (wchar_t*)wParam; switch (lParam & 0x7fffffff) { case SM_ERROR: ppd2.lchIcon = LoadIconEx(IDI_MB_STOP, 0); @@ -459,7 +459,7 @@ INT_PTR Popup_CreateClassPopup(WPARAM wParam, LPARAM lParam) if (pc->flags & PCF_UNICODE) { ppd2.flags = PU2_UNICODE; ppd2.lptzTitle = (wchar_t*)pdc->pwszTitle; - ppd2.lptzText = (wchar_t*)pdc->pwszText; + ppd2.lpwzText = (wchar_t*)pdc->pwszText; } else { ppd2.flags = PU2_ANSI; -- cgit v1.2.3