ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fix a warning caused by the TAB patch. 

- Initialize *pcb to a large value before calling the stream-out
  callback (to make applications that don't set *pcb at all happy).
- Don't flush the output stream when error condition is set.
This commit is contained in:
Krzysztof Foltman 2005-06-20 10:31:38 +00:00 committed by Alexandre Julliard
parent fcd6764928
commit cb836344cd
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/riched20/writer.c
View File

@ -45,11 +45,23 @@ ME_StreamOutFlush(ME_TextEditor *editor)
{ {
LONG nStart = 0; LONG nStart = 0;
LONG nWritten = 0; LONG nWritten = 0;
LONG nRemaining = 0;
EDITSTREAM *stream = editor->pStream->stream; EDITSTREAM *stream = editor->pStream->stream;
do { do {
TRACE("sending %lu bytes\n", editor->pStream->pos - nStart);
/* Some apps seem not to set *pcb unless a problem arises, relying
on initial random nWritten value, which is usually >STREAMOUT_BUFFER_SIZE */
nRemaining = editor->pStream->pos - nStart;
nWritten = 0xDEADBEEF;
stream->dwError = stream->pfnCallback(stream->dwCookie, editor->pStream->buffer + nStart, stream->dwError = stream->pfnCallback(stream->dwCookie, editor->pStream->buffer + nStart,
editor->pStream->pos - nStart, &nWritten); editor->pStream->pos - nStart, &nWritten);
TRACE("error=%lu written=%lu\n", stream->dwError, nWritten);
if (nWritten > (editor->pStream->pos - nStart) || nWritten<0) {
FIXME("Invalid returned written size *pcb: 0x%x (%ld) instead of %ld\n",
(unsigned)nWritten, nWritten, nRemaining);
nWritten = nRemaining;
}
if (nWritten == 0 || stream->dwError) if (nWritten == 0 || stream->dwError)
return FALSE; return FALSE;
editor->pStream->written += nWritten; editor->pStream->written += nWritten;
@ -64,6 +76,7 @@ static LONG
ME_StreamOutFree(ME_TextEditor *editor) ME_StreamOutFree(ME_TextEditor *editor)
{ {
LONG written = editor->pStream->written; LONG written = editor->pStream->written;
TRACE("total length = %lu\n", written);
FREE_OBJ(editor->pStream); FREE_OBJ(editor->pStream);
editor->pStream = NULL; editor->pStream = NULL;
@ -782,7 +795,7 @@ ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream)
ME_StreamOutRTF(editor, nStart, nTo - nStart, dwFormat); ME_StreamOutRTF(editor, nStart, nTo - nStart, dwFormat);
else if (dwFormat & SF_TEXT || dwFormat & SF_TEXTIZED) else if (dwFormat & SF_TEXT || dwFormat & SF_TEXTIZED)
ME_StreamOutText(editor, nStart, nTo - nStart, dwFormat); ME_StreamOutText(editor, nStart, nTo - nStart, dwFormat);
if (!editor->pStream->stream->dwError)
ME_StreamOutFlush(editor); ME_StreamOutFlush(editor);
return ME_StreamOutFree(editor); return ME_StreamOutFree(editor);
} }