From 688f55ba998c19304a29727c910504903f4cc49a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 30 Nov 2014 18:51:36 +0000 Subject: lstr* replacements git-svn-id: http://svn.miranda-ng.org/main/trunk@11176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TooltipNotify/src/Tooltip.cpp | 4 ++-- plugins/TooltipNotify/src/TooltipNotify.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/TooltipNotify') diff --git a/plugins/TooltipNotify/src/Tooltip.cpp b/plugins/TooltipNotify/src/Tooltip.cpp index fd7610bc59..d55ad2c156 100644 --- a/plugins/TooltipNotify/src/Tooltip.cpp +++ b/plugins/TooltipNotify/src/Tooltip.cpp @@ -84,7 +84,7 @@ LRESULT CALLBACK CTooltip::WindowProc(HWND hWnd, UINT message, WPARAM wParam, LP SetBkMode(hDC, TRANSPARENT); SetTextColor(hDC, m_dwTextColor); SelectObject(hDC, m_hFont); - DrawText(hDC, m_szText, lstrlen(m_szText), &rect, DT_CENTER|DT_VCENTER|DT_SINGLELINE); + DrawText(hDC, m_szText, mir_tstrlen(m_szText), &rect, DT_CENTER|DT_VCENTER|DT_SINGLELINE); EndPaint(hWnd, &ps); @@ -147,7 +147,7 @@ void CTooltip::Validate() SIZE Size; HDC hDC = GetDC(m_hWnd); SelectObject(hDC, m_hFont); - GetTextExtentPoint32(hDC, m_szText, lstrlen(m_szText), &Size); + GetTextExtentPoint32(hDC, m_szText, mir_tstrlen(m_szText), &Size); SetWindowPos(m_hWnd, 0, 0, 0, Size.cx+6, Size.cy+4, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOREDRAW); ReleaseDC(m_hWnd, hDC); diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp index b46e11d61d..4a44de9750 100644 --- a/plugins/TooltipNotify/src/TooltipNotify.cpp +++ b/plugins/TooltipNotify/src/TooltipNotify.cpp @@ -725,7 +725,7 @@ BOOL CTooltipNotify::ProtosDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP ListView_GetItemText(GetDlgItem(hDlg,IDC_PROTOS), i, 0, szProto, SIZEOF(szProto)); char szMultiByteProto[128]; - long lLen = WideCharToMultiByte(CP_ACP, 0, szProto, lstrlen(szProto), + long lLen = WideCharToMultiByte(CP_ACP, 0, szProto, mir_tstrlen(szProto), szMultiByteProto, sizeof(szMultiByteProto), NULL, NULL); szMultiByteProto[lLen] = '\0'; @@ -869,26 +869,26 @@ TCHAR *CTooltipNotify::StatusToString(int iStatus, TCHAR *szStatus, int iBufSize { if((iStatus>=ID_STATUS_OFFLINE) && (iStatus<=ID_STATUS_OUTTOLUNCH)) { - lstrcpyn(szStatus, (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION,iStatus,GSMDF_TCHAR), iBufSize); + mir_tstrncpy(szStatus, (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION,iStatus,GSMDF_TCHAR), iBufSize); } else { switch(iStatus) { case ID_TTNTF_STATUS_TYPING: - lstrcpyn(szStatus, TranslateT("Typing"), iBufSize); + mir_tstrncpy(szStatus, TranslateT("Typing"), iBufSize); break; case ID_TTNTF_STATUS_IDLE: - lstrcpyn(szStatus, TranslateT("Idle"), iBufSize); + mir_tstrncpy(szStatus, TranslateT("Idle"), iBufSize); break; case ID_TTNTF_STATUS_NOT_IDLE: - lstrcpyn(szStatus, TranslateT("Not Idle"), iBufSize); + mir_tstrncpy(szStatus, TranslateT("Not Idle"), iBufSize); break; default: - lstrcpyn(szStatus, TranslateT("Unknown"), iBufSize); + mir_tstrncpy(szStatus, TranslateT("Unknown"), iBufSize); break; } } -- cgit v1.2.3