From 2e4abd268c71f15bcf73c49a5005f128ffd8ee96 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 16 May 2013 15:08:49 +0000 Subject: shortened typedefs for string buffers: MCBuf -> mir_ptr MTBuf -> mir_ptr MWBuf -> mir_ptr git-svn-id: http://svn.miranda-ng.org/main/trunk@4680 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MRA/src/MraSendCommand.cpp | 4 ++-- protocols/MRA/src/Mra_svcs.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/MRA/src') diff --git a/protocols/MRA/src/MraSendCommand.cpp b/protocols/MRA/src/MraSendCommand.cpp index cd38d07c03..1eb45085be 100644 --- a/protocols/MRA/src/MraSendCommand.cpp +++ b/protocols/MRA/src/MraSendCommand.cpp @@ -105,7 +105,7 @@ DWORD CMraProto::MraMessageW(BOOL bAddToQueue, HANDLE hContact, DWORD dwAckType, dwFlags |= MESSAGE_FLAG_RTF; lpszMessageRTF = (LPSTR)mir_calloc(dwRFTBuffSize); - mir_ptr lpbRTFData((char*)mir_calloc(dwRFTBuffSize)); + MCBuf lpbRTFData((char*)mir_calloc(dwRFTBuffSize)); if (lpszMessageRTF && lpbRTFData) { DWORD dwBackColour = mraGetDword(NULL, "RTFBackgroundColour", MRA_DEFAULT_RTF_BACKGROUND_COLOUR); lpbDataCurrent = (LPBYTE)lpszMessageRTF; @@ -130,7 +130,7 @@ DWORD CMraProto::MraMessageW(BOOL bAddToQueue, HANDLE hContact, DWORD dwAckType, size_t dwRFTBuffSize = (((dwMessageSize*sizeof(WCHAR))*16)+8192), dwRTFDataSize; lpszMessageRTF = (LPSTR)mir_calloc(dwRFTBuffSize); - mir_ptr lpbRTFData((char*)mir_calloc(dwRFTBuffSize)); + MCBuf lpbRTFData((char*)mir_calloc(dwRFTBuffSize)); if (lpszMessageRTF && lpbRTFData) { if ( !MraConvertToRTFW(lpwszMessage, dwMessageSize, (LPSTR)lpbRTFData, dwRFTBuffSize, &dwRTFDataSize)) { DWORD dwBackColour = mraGetDword(NULL, "RTFBackgroundColour", MRA_DEFAULT_RTF_BACKGROUND_COLOUR); diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp index 075fd72040..0852b973cc 100644 --- a/protocols/MRA/src/Mra_svcs.cpp +++ b/protocols/MRA/src/Mra_svcs.cpp @@ -186,7 +186,7 @@ INT_PTR CMraProto::MraSendSMS(WPARAM wParam, LPARAM lParam) if (!m_bLoggedIn || !wParam || !lParam) return 0; - mir_ptr lpwszMessageXMLEncoded( mir_utf8decodeW((LPSTR)lParam)); + MWBuf lpwszMessageXMLEncoded( mir_utf8decodeW((LPSTR)lParam)); size_t dwBuffLen = lstrlenA((LPSTR)lParam) + MAX_PATH; LPWSTR lpwszMessageXMLDecoded = (LPWSTR)mir_calloc((dwBuffLen*sizeof(WCHAR))); if (lpwszMessageXMLEncoded && lpwszMessageXMLDecoded) { -- cgit v1.2.3