summaryrefslogtreecommitdiff
path: root/protocols/MRA
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-05-16 15:19:22 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-05-16 15:19:22 +0000
commit011137bd4d5ef75cfb832f82a0cb47b06124a022 (patch)
treeb074d2b22acbc4eac3c39e01c4842a5f908c2c3f /protocols/MRA
parentfa02e76e325bfec6ca2737fcb086cab4e3de3cba (diff)
words of wisdom were well received
now the shortened types are called ptrA, ptrT & ptrW respectively git-svn-id: http://svn.miranda-ng.org/main/trunk@4682 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA')
-rw-r--r--protocols/MRA/src/MraSendCommand.cpp4
-rw-r--r--protocols/MRA/src/Mra_svcs.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/protocols/MRA/src/MraSendCommand.cpp b/protocols/MRA/src/MraSendCommand.cpp
index 1eb45085be..00f7558033 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);
- MCBuf lpbRTFData((char*)mir_calloc(dwRFTBuffSize));
+ ptrA 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);
- MCBuf lpbRTFData((char*)mir_calloc(dwRFTBuffSize));
+ ptrA 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 0852b973cc..58faf4bd1e 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;
- MWBuf lpwszMessageXMLEncoded( mir_utf8decodeW((LPSTR)lParam));
+ ptrW lpwszMessageXMLEncoded( mir_utf8decodeW((LPSTR)lParam));
size_t dwBuffLen = lstrlenA((LPSTR)lParam) + MAX_PATH;
LPWSTR lpwszMessageXMLDecoded = (LPWSTR)mir_calloc((dwBuffLen*sizeof(WCHAR)));
if (lpwszMessageXMLEncoded && lpwszMessageXMLDecoded) {