From ab53b72bf7067feb9dede0fd76b5a3cbc13863b9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 2 Jun 2015 15:55:48 +0000 Subject: - old PNG conversion code (png2dib, dib2png) removed; - m_png.h also removed; - all calls of LoadImage replaced with CallService(MS_IMG_LOAD); - four invalid CloseHandle() calls removed; - massive code cleaning for Popup, HistoryStats & SplashScreen plugins git-svn-id: http://svn.miranda-ng.org/main/trunk@13974 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_string.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'include/m_string.h') diff --git a/include/m_string.h b/include/m_string.h index 82e279f31f..ae769e52bc 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -607,18 +607,21 @@ public: return _vscwprintf(pszFormat, args); } -#pragma warning(push) -#pragma warning(disable : 4995 4996) static int __stdcall Format(LPWSTR pszBuffer, LPCWSTR pszFormat, va_list args) { + #pragma warning(push) + #pragma warning(disable : 4996) return vswprintf(pszBuffer, pszFormat, args); + #pragma warning(pop) } static int __stdcall Format(LPWSTR pszBuffer, size_t nLength, LPCWSTR pszFormat, va_list args) { + #pragma warning(push) + #pragma warning(disable : 4996) return _vsnwprintf(pszBuffer, nLength, pszFormat, args); + #pragma warning(pop) } -#pragma warning(pop) static int __stdcall GetBaseTypeLength(LPCSTR pszSrc) { -- cgit v1.2.3