diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-09-27 13:07:30 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-09-27 13:07:30 +0000 |
| commit | 6839e6aa877dfd7f86571361b1d85bf7f15fa427 (patch) | |
| tree | 76281731ba910423136e73116809362332b1f9e6 | |
| parent | 3ef638023d476a91128f287fe454b547836a4b90 (diff) | |
fix for offline messages
git-svn-id: http://svn.miranda-ng.org/main/trunk@1681 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/MRA/MraFilesQueue.cpp | 5 | ||||
| -rw-r--r-- | protocols/MRA/MraOfflineMsg.cpp | 2 | ||||
| -rw-r--r-- | protocols/MRA/MraRTFMsg.cpp | 2 | ||||
| -rw-r--r-- | protocols/MRA/proto.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/protocols/MRA/MraFilesQueue.cpp b/protocols/MRA/MraFilesQueue.cpp index 02564c0879..539bf9562d 100644 --- a/protocols/MRA/MraFilesQueue.cpp +++ b/protocols/MRA/MraFilesQueue.cpp @@ -150,7 +150,7 @@ DWORD MraFilesQueueInitialize(DWORD dwSendTimeOutInterval, HANDLE *phFilesQueueH DWORD dwRetErrorCode = ListMTInitialize(pmrafqFilesQueue, 0);
if (dwRetErrorCode == NO_ERROR) {
pmrafqFilesQueue->dwSendTimeOutInterval = dwSendTimeOutInterval;
- (*phFilesQueueHandle) = (HANDLE)pmrafqFilesQueue;
+ *phFilesQueueHandle = (HANDLE)pmrafqFilesQueue;
}
else mir_free(pmrafqFilesQueue);
@@ -1030,7 +1030,6 @@ void CMraProto::MraFilesQueueSendThreadProc(LPVOID lpParameter) BYTE btBuff[BUFF_SIZE_RCV];
BOOL bFailed = TRUE, bOK, bConnected = FALSE;
DWORD dwReceived, dwSendBlockSize, dwUpdateTimeNext, dwUpdateTimeCur;
- HANDLE hFile;
size_t i, j, dwBuffSizeUsed = 0;
LPWSTR lpwszFileName;
@@ -1104,7 +1103,7 @@ void CMraProto::MraFilesQueueSendThreadProc(LPVOID lpParameter) }
if (bFailed == FALSE) {
- hFile = CreateFileW(dat->pmfqfFiles[j].lpwszName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, (FILE_ATTRIBUTE_NORMAL|FILE_FLAG_SEQUENTIAL_SCAN), NULL);
+ HANDLE hFile = CreateFileW(dat->pmfqfFiles[j].lpwszName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, (FILE_ATTRIBUTE_NORMAL|FILE_FLAG_SEQUENTIAL_SCAN), NULL);
if (hFile != INVALID_HANDLE_VALUE) {
bOK = FALSE;
dwUpdateTimeNext = GetTickCount();
diff --git a/protocols/MRA/MraOfflineMsg.cpp b/protocols/MRA/MraOfflineMsg.cpp index 868b23dcc6..e3e8b76aff 100644 --- a/protocols/MRA/MraOfflineMsg.cpp +++ b/protocols/MRA/MraOfflineMsg.cpp @@ -99,7 +99,7 @@ DWORD MraOfflineMessageGet(MRA_LPS *plpsMsg, DWORD *pdwTime, DWORD *pdwFlags, MR LPSTR lpszBoundary, lpszMIMEPart, lpszCurMIMEPos, lpszMIMEHeader, lpszMIMEHeaderLow, lpszMIMEBody, lpszMIMEContentType;
size_t i, dwBoundarySize, dwMIMEPartSize, dwMIMEHeaderSize, dwMIMEBodySize, dwMIMEContentTypeSize;
- lpszBoundary = (LPSTR)MemoryFind(0, lpszContentTypeLow, dwContentTypeSize, "boundary = ", 9);
+ lpszBoundary = (LPSTR)MemoryFind(0, lpszContentTypeLow, dwContentTypeSize, "boundary=", 9);
if (lpszBoundary)
{
dwBoundarySize = ((dwContentTypeSize-(lpszBoundary-lpszContentTypeLow))-9);
diff --git a/protocols/MRA/MraRTFMsg.cpp b/protocols/MRA/MraRTFMsg.cpp index 0e6e76f4ce..9866e44a99 100644 --- a/protocols/MRA/MraRTFMsg.cpp +++ b/protocols/MRA/MraRTFMsg.cpp @@ -20,7 +20,7 @@ static const LPSTR lpszColours[COLORTABLE_COUNT] = #define PAR "\\par "
-#define BB_COLOR_TAG "[color = "
+#define BB_COLOR_TAG "[color="
#define SYMBOLS_COUNT 19
static const LPSTR lpszSimbols[SYMBOLS_COUNT] =
{
diff --git a/protocols/MRA/proto.h b/protocols/MRA/proto.h index d881733480..bf0c28e03a 100644 --- a/protocols/MRA/proto.h +++ b/protocols/MRA/proto.h @@ -171,7 +171,7 @@ mrim_packet_header_t; #define USER_AGENT_MAX 255
// Format:
// user_agent = param *(param )
- // param = pname " = " pvalue
+ // param = pname "=" pvalue
// pname = token
// pvalue = token / quoted-string
//
|