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) --- src/core/stdmsg/src/chat_manager.cpp | 2 +- src/core/stdssl/src/netlibssl.cpp | 2 +- src/mir_app/src/chat_tools.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp index 7ce4349f38..5f01aa640c 100644 --- a/src/core/stdmsg/src/chat_manager.cpp +++ b/src/core/stdmsg/src/chat_manager.cpp @@ -224,7 +224,7 @@ static void ShowRoom(SESSION_INFO *si) int OnCheckPlugins(WPARAM, LPARAM) { g_dat.bSmileyInstalled = ServiceExists(MS_SMILEYADD_REPLACESMILEYS); - g_dat.bPopupInstalled = ServiceExists(MS_POPUP_ADDPOPUPT); + g_dat.bPopupInstalled = ServiceExists(MS_POPUP_ADDPOPUPW); return 0; } diff --git a/src/core/stdssl/src/netlibssl.cpp b/src/core/stdssl/src/netlibssl.cpp index 5b070ce28f..9ce246b08b 100644 --- a/src/core/stdssl/src/netlibssl.cpp +++ b/src/core/stdssl/src/netlibssl.cpp @@ -87,7 +87,7 @@ static void ReportSslError(SECURITY_STATUS scRet, int line, bool = false) mir_free(szMsg); SetLastError(scRet); - PUShowMessageT(szMsgBuf2, SM_WARNING); + PUShowMessageW(szMsgBuf2, SM_WARNING); } static bool AcquireCredentials(void) diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp index 51f1317b54..12e33f87eb 100644 --- a/src/mir_app/src/chat_tools.cpp +++ b/src/mir_app/src/chat_tools.cpp @@ -175,7 +175,7 @@ int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char *pszProtoNa mir_vsnwprintf(szBuf, 4096, fmt, marker); va_end(marker); - POPUPDATAT pd = { 0 }; + POPUPDATAW pd = { 0 }; pd.lchContact = hContact; if (hIcon) @@ -184,8 +184,8 @@ int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char *pszProtoNa pd.lchIcon = LoadIconEx("window", FALSE); PROTOACCOUNT *pa = Proto_GetAccount(pszProtoName); - mir_snwprintf(pd.lptzContactName, L"%s - %s", (pa == nullptr) ? _A2T(pszProtoName) : pa->tszAccountName, Clist_GetContactDisplayName(hContact)); - mir_wstrncpy(pd.lptzText, TranslateW(szBuf), _countof(pd.lptzText)); + mir_snwprintf(pd.lpwzContactName, L"%s - %s", (pa == nullptr) ? _A2T(pszProtoName) : pa->tszAccountName, Clist_GetContactDisplayName(hContact)); + mir_wstrncpy(pd.lpwzText, TranslateW(szBuf), _countof(pd.lpwzText)); pd.iSeconds = g_Settings->iPopupTimeout; if (g_Settings->iPopupStyle == 2) { @@ -203,7 +203,7 @@ int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char *pszProtoNa pd.PluginWindowProc = PopupDlgProc; pd.PluginData = si; - return PUAddPopupT(&pd); + return PUAddPopupW(&pd); } BOOL DoPopup(SESSION_INFO *si, GCEVENT *gce) -- cgit v1.2.3